diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-03-09 21:07:24 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-03-09 21:07:24 +0100 |
| commit | 779c404de7910eb417f12767551fad389633c716 (patch) | |
| tree | 07dd3088ae5192ce91a930a29df2e09e361d3e35 /math | |
| parent | 07db3f552376bce3bcbf785ec67ea03a7f82017a (diff) | |
| download | glibc-779c404de7910eb417f12767551fad389633c716.zip glibc-779c404de7910eb417f12767551fad389633c716.tar.gz glibc-779c404de7910eb417f12767551fad389633c716.tar.bz2 | |
math: test-matherr and test-matherr-2 can be regular tests
compat_symbol_reference is now available without tests-internal.
Do not build the test at all on glibc versions that lack the symbols,
to avoid spurious UNSUPPORTED results.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 6 | ||||
| -rw-r--r-- | math/test-matherr.c | 13 |
2 files changed, 7 insertions, 12 deletions
diff --git a/math/Makefile b/math/Makefile index 2978abf..98b26e4 100644 --- a/math/Makefile +++ b/math/Makefile @@ -249,7 +249,11 @@ tests-static = test-fpucw-static test-fpucw-ieee-static \ test-signgam-uchar-static test-signgam-uchar-init-static \ test-signgam-uint-static test-signgam-uint-init-static \ test-signgam-ullong-static test-signgam-ullong-init-static -tests-internal = test-matherr test-matherr-2 + +# The tested symbols matherr, _LIB_VERSION have been removed in glibc 2.27. +ifeq ($(have-GLIBC_2.26)$(build-shared),yesyes) +tests += test-matherr test-matherr-2 +endif # These tests use internal (unexported) GMP functions and are linked # statically to obtain access to these functions. diff --git a/math/test-matherr.c b/math/test-matherr.c index e68a4a3..aed396e 100644 --- a/math/test-matherr.c +++ b/math/test-matherr.c @@ -23,10 +23,8 @@ #include <math-svid-compat.h> #include <shlib-compat.h> -#if TEST_COMPAT (libm, GLIBC_2_0, GLIBC_2_27) - -# undef matherr -# undef _LIB_VERSION +#undef matherr +#undef _LIB_VERSION compat_symbol_reference (libm, matherr, matherr, GLIBC_2_0); compat_symbol_reference (libm, _LIB_VERSION, _LIB_VERSION, GLIBC_2_0); @@ -47,12 +45,5 @@ do_test (void) acos (2.0); return fail; } -#else -static int -do_test (void) -{ - return 77; -} -#endif #include <support/test-driver.c> |