public inbox for libc-alpha@sourceware.org
 help / color / mirror / Atom feed
From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH] resolv: tst-p_secstodate can be a regular test
Date: Fri, 05 Mar 2021 13:57:06 +0100	[thread overview]
Message-ID: <874khpg3ml.fsf@oldenburg.str.redhat.com> (raw)

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.

---
 resolv/Makefile           |  4 +++-
 resolv/tst-p_secstodate.c | 12 ------------
 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>


             reply	other threads:[~2021-03-05 12:57 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-05 12:57 Florian Weimer [this message]
2021-03-08 13:46 ` Adhemerval Zanella

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=874khpg3ml.fsf@oldenburg.str.redhat.com \
    --to=fweimer@redhat.com \
    --cc=libc-alpha@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).