From 63c317fe318b7fcf0b09a7891bbf5a1c1016c374 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 9 Mar 2021 21:07:24 +0100
Subject: [PATCH] posix: tst-spawn4-compat can be a regular test

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.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
---
 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 2ee5bb6..305ec75 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 77f6ed6..30ba067 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>
-- 
2.7.4