From 74159dc58af2ce8a32b62daecd587f29ff7931f2 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 9 Feb 2020 17:15:47 +0000 Subject: [PATCH] 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. --- nptl/Makefile | 3 +-- sysdeps/mach/hurd/i386/Makefile | 5 +++++ sysdeps/pthread/Makefile | 3 ++- {nptl => sysdeps/pthread}/tst-mutex1.c | 0 {nptl => sysdeps/pthread}/tst-mutex10.c | 0 {nptl => sysdeps/pthread}/tst-mutex2.c | 0 {nptl => sysdeps/pthread}/tst-mutex3.c | 0 {nptl => sysdeps/pthread}/tst-mutex4.c | 0 {nptl => sysdeps/pthread}/tst-mutex6.c | 0 {nptl => sysdeps/pthread}/tst-mutex8.c | 0 10 files changed, 8 insertions(+), 3 deletions(-) rename {nptl => sysdeps/pthread}/tst-mutex1.c (100%) rename {nptl => sysdeps/pthread}/tst-mutex10.c (100%) rename {nptl => sysdeps/pthread}/tst-mutex2.c (100%) rename {nptl => sysdeps/pthread}/tst-mutex3.c (100%) rename {nptl => sysdeps/pthread}/tst-mutex4.c (100%) rename {nptl => sysdeps/pthread}/tst-mutex6.c (100%) rename {nptl => sysdeps/pthread}/tst-mutex8.c (100%) diff --git a/nptl/Makefile b/nptl/Makefile index baa6c66778..774cf0a754 100644 --- 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 2a7d138fff..584d9275c9 100644 --- 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 6b66031706..fb467d8e79 100644 --- 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