pthread: Move most barrier tests from nptl to sysdeps/pthread

So they can be checked with htl too.

diff --git a/nptl/Makefile b/nptl/Makefile
index 80e293209c2582406fff806646d813355777bd1c..a72022a052701aac0fc9915a6bc5d4940c1597c0 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -250,7 +250,6 @@ tests = tst-attr2 tst-attr3 tst-default-attr \
        tst-rwlock14 tst-rwlock15 tst-rwlock17 tst-rwlock18 \
        tst-once5 \
        tst-sem5 tst-sem17 \
-       tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
        tst-align tst-align3 \
        tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \
        tst-raise1 \

diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
index a5ccab09569c60a2cc8ffac43564be861dd073b0..445724f85fbd82200124bd72bd1a8f0fb0804d4f 100644 (file)
--- a/sysdeps/mach/hurd/i386/Makefile
+++ b/sysdeps/mach/hurd/i386/Makefile
@@ -112,6 +112,7 @@ test-xfail-tst-cond23 = yes
 test-xfail-tst-rwlock4 = yes
 test-xfail-tst-rwlock12 = yes
 test-xfail-tst-sem3 = yes
+test-xfail-tst-barrier2 = yes
 endif
 
 # For bug 25522

diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 2f07c0cfe60bebfad987c4349d96d2f253e062ae..c102f45b6a3d0e16395e375a7d6251abb06fba4b 100644 (file)
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -43,6 +43,7 @@ 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-attr1 \
+        tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \
         tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
         tst-basic7 \
         tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \

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

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

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

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