aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-03-09 21:07:24 +0100
committerFlorian Weimer <fweimer@redhat.com>2021-03-09 21:07:24 +0100
commitcfaf53672393c95c47602520cb2b6afd04230215 (patch)
tree1bf26aefc9a273a819e633e9b918a1b31fb0a063
parent63c317fe318b7fcf0b09a7891bbf5a1c1016c374 (diff)
downloadglibc-cfaf53672393c95c47602520cb2b6afd04230215.tar
glibc-cfaf53672393c95c47602520cb2b6afd04230215.tar.gz
glibc-cfaf53672393c95c47602520cb2b6afd04230215.tar.bz2
glibc-cfaf53672393c95c47602520cb2b6afd04230215.zip
resolv: tst-p_secstodate can be a regular test
Now that compat_symbol_reference works for non-internal tests, too. Also do not build and run the tests on architectures which lack the __p_secstodate compatibility symbol. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
-rw-r--r--resolv/Makefile4
-rw-r--r--resolv/tst-p_secstodate.c12
2 files changed, 3 insertions, 13 deletions
diff --git a/resolv/Makefile b/resolv/Makefile
index 1047bb6ae5..fb19c93026 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -94,7 +94,9 @@ endif # $(build-shared)
tests-internal += tst-inet_pton
# This test accesses the __p_secstodate compat symbol.
-tests-internal += tst-p_secstodate
+ifeq ($(have-GLIBC_2.26)$(build-shared),yesyes)
+tests += tst-p_secstodate
+endif
# This test sends millions of packets and is rather slow.
xtests += tst-resolv-qtypes
diff --git a/resolv/tst-p_secstodate.c b/resolv/tst-p_secstodate.c
index 78b3aa1d6f..f45c908025 100644
--- a/resolv/tst-p_secstodate.c
+++ b/resolv/tst-p_secstodate.c
@@ -25,8 +25,6 @@
#include <shlib-compat.h>
-#if TEST_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_27)
-
char *__p_secstodate (unsigned long int);
compat_symbol_reference (libresolv, __p_secstodate, __p_secstodate, GLIBC_2_0);
@@ -71,14 +69,4 @@ do_test (void)
return ret;
}
-#else
-
-static int
-do_test (void)
-{
- return 77;
-}
-
-#endif
-
#include <support/test-driver.c>