selftests/nolibc: gettid: restore for glibc and musl

As the gettid manpage [1] shows, glibc 2.30 has gettid support, so,
let's enable the test for glibc >= 2.30.

gettid works on musl too.

[1]: https://man7.org/linux/man-pages/man2/gettid.2.html

Reviewed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c
index 7806032..d51eac5 100644 (file)
--- a/tools/testing/selftests/nolibc/nolibc-test.c
+++ b/tools/testing/selftests/nolibc/nolibc-test.c
@@ -668,6 +668,7 @@ int run_syscall(int min, int max)
        int tmp;
        int ret = 0;
        void *p1, *p2;
+       int has_gettid = 1;
 
        /* <proc> indicates whether or not /proc is mounted */
        proc = stat("/proc", &stat_buf) == 0;
@@ -675,6 +676,11 @@ int run_syscall(int min, int max)
        /* this will be used to skip certain tests that can't be run unprivileged */
        euid0 = geteuid() == 0;
 
+       /* from 2.30, glibc provides gettid() */
+#if defined(__GLIBC_MINOR__) && defined(__GLIBC__)
+       has_gettid = __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 30);
+#endif
+
        for (test = min; test >= 0 && test <= max; test++) {
                int llen = 0; /* line length */
 
@@ -684,9 +690,7 @@ int run_syscall(int min, int max)
                switch (test + __LINE__ + 1) {
                CASE_TEST(getpid);            EXPECT_SYSNE(1, getpid(), -1); break;
                CASE_TEST(getppid);           EXPECT_SYSNE(1, getppid(), -1); break;
-#ifdef NOLIBC
-               CASE_TEST(gettid);            EXPECT_SYSNE(1, gettid(), -1); break;
-#endif
+               CASE_TEST(gettid);            EXPECT_SYSNE(has_gettid, gettid(), -1); break;
                CASE_TEST(getpgid_self);      EXPECT_SYSNE(1, getpgid(0), -1); break;
                CASE_TEST(getpgid_bad);       EXPECT_SYSER(1, getpgid(-1), -1, ESRCH); break;
                CASE_TEST(kill_0);            EXPECT_SYSZR(1, kill(getpid(), 0)); break;