From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Subject: [PATCH] posix: tst-glob_lstat_compat no longer needs to be an internal test
Date: Fri, 05 Mar 2021 13:56:47 +0100 [thread overview]
Message-ID: <87czwdg3n4.fsf@oldenburg.str.redhat.com> (raw)
compat_symbol_reference is now available for regular tests as well.
Also avoid building and running the tests in case the pre-2.27
symbol version of glob is not available. This avoids a spurious
UNSUPPORTED result.
---
posix/Makefile | 8 +++++++-
posix/tst-glob_lstat_compat.c | 19 ++++---------------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/posix/Makefile b/posix/Makefile
index 239fbb340a..2ee5bb6e1d 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -104,9 +104,15 @@ tests := test-errno tstgetopt testfnm runtests runptests \
tst-glob-tilde test-ssize-max tst-spawn4 bug-regex37 \
bug-regex38 tst-regcomp-truncated tst-spawn-chdir \
tst-wordexp-nocmd
+
+# Test for the glob symbol version that was replaced in glibc 2.27.
+ifeq ($(have-GLIBC_2.26)$(build-shared),yesyes)
+tests += tst-glob_lstat_compat
+endif
+
tests-internal := bug-regex5 bug-regex20 bug-regex33 \
tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3 \
- tst-glob_lstat_compat tst-spawn4-compat
+ tst-spawn4-compat
tests-container := bug-ga2
xtests := tst-getaddrinfo4 tst-getaddrinfo5 tst-sched_rr_get_interval
ifeq (yes,$(build-shared))
diff --git a/posix/tst-glob_lstat_compat.c b/posix/tst-glob_lstat_compat.c
index ef6f1b8c27..97ee51101b 100644
--- a/posix/tst-glob_lstat_compat.c
+++ b/posix/tst-glob_lstat_compat.c
@@ -25,24 +25,22 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-
+#include <stdbool.h>
#include <stdio.h>
#include <shlib-compat.h>
#include <support/check.h>
#include <support/temp_file.h>
-#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_27)
-
__typeof (glob) glob;
/* On alpha glob exists in version GLIBC_2_0, GLIBC_2_1, and GLIBC_2_27.
This test needs to access the version prior to GLIBC_2_27, which is
GLIBC_2_1 on alpha, GLIBC_2_0 elsewhere. */
-# ifdef __alpha__
+#ifdef __alpha__
compat_symbol_reference (libc, glob, glob, GLIBC_2_1);
-# else
+#else
compat_symbol_reference (libc, glob, glob, GLIBC_2_0);
-# endif
+#endif
/* Compat glob should not call gl_lstat since for some old binaries it
might be unitialized (for instance GNUmake). Check if it is indeed
@@ -256,13 +254,4 @@ do_test (void)
return 0;
}
-#else /* TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_27) */
-
-static int
-do_test (void)
-{
- return 77;
-}
-#endif
-
#include <support/test-driver.c>
next 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 13:07 ` 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=87czwdg3n4.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).