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

So they can be checked with htl too.

XFAIL tst-mutex4, for which support is still missing in htl.

diff --git a/nptl/Makefile b/nptl/Makefile
index baa6c66778062aac5e3ec265c52776f1b01c49d3..774cf0a7549e7ea2e24c721292a2f74b654c5020 100644 (file)
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -235,8 +235,7 @@ CFLAGS-tst-minstack-throw.o = -std=gnu++11
 LDLIBS-tst-minstack-throw = -lstdc++
 
 tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
-       tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \
-       tst-mutex7 tst-mutex9 tst-mutex10 tst-mutex11 tst-mutex5a tst-mutex7a \
+       tst-mutex5 tst-mutex7 tst-mutex9 tst-mutex11 tst-mutex5a tst-mutex7a \
        tst-mutex7robust tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 \
        tst-mutexpi5 tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \
        tst-mutexpi9 \

diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile
index 2a7d138fff216ecf3c31e3ab1b80d69a8c1ce42d..584d9275c93a9cb0d59bd4cce8a29e7a38a475ac 100644 (file)
--- a/sysdeps/mach/hurd/i386/Makefile
+++ b/sysdeps/mach/hurd/i386/Makefile
@@ -101,6 +101,11 @@ ifeq ($(subdir),mach)
 test-xfail-check-abi-libmachuser = yes
 endif
 
+# For bug 25521
+ifeq ($(subdir),htl)
+test-xfail-tst-mutex4 = yes
+endif
+
 ifeq ($(subdir),elf)
 # We do use nested functions involving creation of trampolines, notably for
 # callbacks whose parameters don't permit to get the context parameters.

diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 6b66031706d25e155184813a65ab8411d24f88e8..fb467d8e7959579d3584011e71d73147ca1fd935 100644 (file)
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -44,6 +44,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
         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 \
-        tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
+        tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex6 tst-mutex10 \
+        tst-spin1 tst-spin2 tst-spin3 tst-spin4
 
 endif

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

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

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

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

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

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

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