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] posix: tst-spawn4-compat can be a regular test
Date: Fri, 05 Mar 2021 13:56:58 +0100	[thread overview]
Message-ID: <878s71g3mt.fsf@oldenburg.str.redhat.com> (raw)

compat_symbol_reference now works for non-internal tests, too.
Also stop building and running the tests on those architectures
that lack the test symbol versions.

---
 posix/Makefile            | 9 +++++++--
 posix/tst-spawn4-compat.c | 8 --------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/posix/Makefile b/posix/Makefile
index 2ee5bb6e1d..305ec757cd 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -110,9 +110,14 @@ ifeq ($(have-GLIBC_2.26)$(build-shared),yesyes)
 tests += tst-glob_lstat_compat
 endif
 
+# Test for the posix_spawn, posix_spawnp symbol versions replaced in
+# glibc 2.15.
+ifeq ($(have-GLIBC_2.14)$(build-shared),yesyes)
+tests += tst-spawn4-compat
+endif
+
 tests-internal	:= bug-regex5 bug-regex20 bug-regex33 \
-		   tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 \
-		   tst-spawn4-compat
+		   tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3
 tests-container := bug-ga2
 xtests		:= tst-getaddrinfo4 tst-getaddrinfo5 tst-sched_rr_get_interval
 ifeq (yes,$(build-shared))
diff --git a/posix/tst-spawn4-compat.c b/posix/tst-spawn4-compat.c
index 77f6ed6c22..30ba0677ba 100644
--- a/posix/tst-spawn4-compat.c
+++ b/posix/tst-spawn4-compat.c
@@ -27,7 +27,6 @@
 #include <support/temp_file.h>
 
 #include <shlib-compat.h>
-#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_15)
 
 compat_symbol_reference (libc, posix_spawn, posix_spawn, GLIBC_2_2);
 compat_symbol_reference (libc, posix_spawnp, posix_spawnp, GLIBC_2_2);
@@ -66,12 +65,5 @@ do_test (void)
 
   return 0;
 }
-#else
-static int
-do_test (void)
-{
-  return 77;
-}
-#endif
 
 #include <support/test-driver.c>


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

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-05 12:56 Florian Weimer [this message]
2021-03-05 14:17 ` 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=878s71g3mt.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).