pthread: Move basic tests from nptl to sysdeps/pthread

So they can be checked with htl too.

diff --git a/nptl/Makefile b/nptl/Makefile
index f762ea26a376dae9fc503300ec8a3091a4c40085..812d01a4e1eeb70264a6650d2b10f54cdd6369ba 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -262,8 +262,6 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
        tst-sem15 tst-sem16 tst-sem17 \
        tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
        tst-align tst-align3 \
-       tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
-       tst-basic7 \
        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 \

diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 889f10d8b1f6f22a0784b0a9c73833113e50dc4c..db4d5730705d234aa90f25493b5186109029d227 100644 (file)
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -41,5 +41,8 @@ libpthread-routines += thrd_create thrd_detach thrd_exit thrd_join \
 
 tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
         tst-cnd-timedwait tst-thrd-detach tst-mtx-basic tst-thrd-sleep \
-        tst-mtx-recursive tst-tss-basic tst-call-once tst-mtx-timedlock
+        tst-mtx-recursive tst-tss-basic tst-call-once tst-mtx-timedlock \
+        tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
+        tst-basic7 \
+
 endif

diff --git a/nptl/tst-basic1.c b/sysdeps/pthread/tst-basic1.c
similarity index 100%
rename from nptl/tst-basic1.c
rename to sysdeps/pthread/tst-basic1.c

diff --git a/nptl/tst-basic2.c b/sysdeps/pthread/tst-basic2.c
similarity index 100%
rename from nptl/tst-basic2.c
rename to sysdeps/pthread/tst-basic2.c

diff --git a/nptl/tst-basic3.c b/sysdeps/pthread/tst-basic3.c
similarity index 100%
rename from nptl/tst-basic3.c
rename to sysdeps/pthread/tst-basic3.c

diff --git a/nptl/tst-basic4.c b/sysdeps/pthread/tst-basic4.c
similarity index 100%
rename from nptl/tst-basic4.c
rename to sysdeps/pthread/tst-basic4.c

diff --git a/nptl/tst-basic5.c b/sysdeps/pthread/tst-basic5.c
similarity index 100%
rename from nptl/tst-basic5.c
rename to sysdeps/pthread/tst-basic5.c

diff --git a/nptl/tst-basic6.c b/sysdeps/pthread/tst-basic6.c
similarity index 100%
rename from nptl/tst-basic6.c
rename to sysdeps/pthread/tst-basic6.c

diff --git a/nptl/tst-basic7.c b/sysdeps/pthread/tst-basic7.c
similarity index 94%
rename from nptl/tst-basic7.c
rename to sysdeps/pthread/tst-basic7.c
index 29a2461efe8d19c31d00a4a925c27f84aa4134b5..26a599c1787080dd6917b71638e08c9e839eab01 100644 (file)
--- a/nptl/tst-basic7.c
+++ b/sysdeps/pthread/tst-basic7.c
@@ -55,7 +55,11 @@ do_test (void)
   pthread_t tid;
 
   /* Allocate the memory needed for the stack.  */
+#ifdef PTHREAD_STACK_MIN
   use_stack_ptr (PTHREAD_STACK_MIN);
+#else
+  use_stack_ptr (4 * getpagesize ());
+#endif
 
   use_up_memory ();