pthread: Move some join tests from nptl to sysdeps/pthread

So they can be checked with htl too.

14 files changed, 16 insertions, 13 deletions

diff --git a/nptl/Makefile b/nptl/Makefile
index a72022a052..6f210d60e3 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -253,7 +253,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
 	tst-align tst-align3 \
 	tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
 	tst-raise1 \
-	tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 tst-join7 \
+	tst-join2 tst-join3 \
 	tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \
 	tst-join14 \
 	tst-detach1 \
@@ -385,7 +385,7 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \
 		tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \
 		tst-tls5modd tst-tls5mode tst-tls5modf tst-stack4mod \
 		tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod \
-		tst-join7mod tst-compat-forwarder-mod tst-audit-threads-mod1 \
+		tst-compat-forwarder-mod tst-audit-threads-mod1 \
 		tst-audit-threads-mod2
 extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) \
 		   tst-cleanup4aux.o tst-cleanupx4aux.o
@@ -579,11 +579,6 @@ $(objpfx)tst-tls6.out: tst-tls6.sh $(objpfx)tst-tls5 \
 	$(evaluate-test)
 endif
 
-$(objpfx)tst-join7: $(libdl) $(shared-thread-library)
-$(objpfx)tst-join7.out: $(objpfx)tst-join7mod.so
-$(objpfx)tst-join7mod.so: $(shared-thread-library)
-LDFLAGS-tst-join7mod.so = -Wl,-soname,tst-join7mod.so
-
 $(objpfx)tst-dlsym1: $(libdl) $(shared-thread-library)
 
 $(objpfx)tst-fini1: $(shared-thread-library) $(objpfx)tst-fini1mod.so
diff --git a/nptl/tst-join10.c b/nptl/tst-join10.c
index 2d1d14f45d..6e94c00f75 100644
--- a/nptl/tst-join10.c
+++ b/nptl/tst-join10.c
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_PTHREAD_CLOCKJOIN_NP_REALTIME 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join11.c b/nptl/tst-join11.c
index c03bd90403..ed8312bc6b 100644
--- a/nptl/tst-join11.c
+++ b/nptl/tst-join11.c
@@ -18,4 +18,4 @@
 
 #define USE_PTHREAD_CLOCKJOIN_NP_REALTIME 1
 #define WAIT_IN_CHILD 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join12.c b/nptl/tst-join12.c
index 10e45bf40c..57d713c82d 100644
--- a/nptl/tst-join12.c
+++ b/nptl/tst-join12.c
@@ -17,4 +17,4 @@
    <http://www.gnu.org/licenses/>.  */
 
 #define USE_PTHREAD_CLOCKJOIN_NP_MONOTONIC 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join13.c b/nptl/tst-join13.c
index 640df5946b..61a9106ebf 100644
--- a/nptl/tst-join13.c
+++ b/nptl/tst-join13.c
@@ -18,4 +18,4 @@
 
 #define USE_PTHREAD_CLOCKJOIN_NP_MONOTONIC 1
 #define WAIT_IN_CHILD 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join8.c b/nptl/tst-join8.c
index 6232bbbd3b..3eddabab6f 100644
--- a/nptl/tst-join8.c
+++ b/nptl/tst-join8.c
@@ -17,4 +17,4 @@
    <https://www.gnu.org/licenses/>.  */
 
 #define USE_PTHREAD_TIMEDJOIN_NP 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/nptl/tst-join9.c b/nptl/tst-join9.c
index 6dc57e8477..e9d0f26146 100644
--- a/nptl/tst-join9.c
+++ b/nptl/tst-join9.c
@@ -18,4 +18,4 @@
 
 #define USE_PTHREAD_TIMEDJOIN_NP 1
 #define WAIT_IN_CHILD 1
-#include <nptl/tst-join5.c>
+#include <sysdeps/pthread/tst-join5.c>
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index c102f45b6a..396f2b18bf 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -51,6 +51,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
 	 tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
 	 tst-cond23 tst-cond24 tst-cond25 \
 	 tst-cond-except \
+	 tst-join1 tst-join4 tst-join5 tst-join6 tst-join7 \
 	 tst-key1 tst-key2 tst-key3 tst-key4 \
 	 tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex6 tst-mutex10 \
 	 tst-once1 tst-once2 tst-once3 tst-once4 \
@@ -62,6 +63,8 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
 
 tests += tst-oncex3 tst-oncex4
 
+modules-names += tst-join7mod
+
 ifeq ($(build-shared),yes)
 tests-static += tst-cond8-static
 tests += tst-cond8-static
@@ -70,4 +73,9 @@ endif
 CFLAGS-tst-oncex3.c += -fexceptions
 CFLAGS-tst-oncex4.c += -fexceptions
 
+$(objpfx)tst-join7: $(libdl) $(shared-thread-library)
+$(objpfx)tst-join7.out: $(objpfx)tst-join7mod.so
+$(objpfx)tst-join7mod.so: $(shared-thread-library)
+LDFLAGS-tst-join7mod.so = -Wl,-soname,tst-join7mod.so
+
 endif
diff --git a/nptl/tst-join1.c b/sysdeps/pthread/tst-join1.c
index 05bf5e4faa..05bf5e4faa 100644
--- a/nptl/tst-join1.c
+++ b/sysdeps/pthread/tst-join1.c
diff --git a/nptl/tst-join4.c b/sysdeps/pthread/tst-join4.c
index 18af45aaf8..18af45aaf8 100644
--- a/nptl/tst-join4.c
+++ b/sysdeps/pthread/tst-join4.c
diff --git a/nptl/tst-join5.c b/sysdeps/pthread/tst-join5.c
index acdc365c05..acdc365c05 100644
--- a/nptl/tst-join5.c
+++ b/sysdeps/pthread/tst-join5.c
diff --git a/nptl/tst-join6.c b/sysdeps/pthread/tst-join6.c
index 0c9e7c056b..0c9e7c056b 100644
--- a/nptl/tst-join6.c
+++ b/sysdeps/pthread/tst-join6.c
diff --git a/nptl/tst-join7.c b/sysdeps/pthread/tst-join7.c
index c077d3cee3..c077d3cee3 100644
--- a/nptl/tst-join7.c
+++ b/sysdeps/pthread/tst-join7.c
diff --git a/nptl/tst-join7mod.c b/sysdeps/pthread/tst-join7mod.c
index 934087dcc6..934087dcc6 100644
--- a/nptl/tst-join7mod.c
+++ b/sysdeps/pthread/tst-join7mod.c