diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-02-09 17:15:47 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-02-09 17:17:06 +0000 |
| commit | 74159dc58af2ce8a32b62daecd587f29ff7931f2 (patch) | |
| tree | 089ea56ba675c3aed5c9a8f66ec8cc2e3469338f | |
| parent | 71d52ac4d65435791d8fa9f52abab7107ef7f7e8 (diff) | |
| download | glibc-74159dc58af2ce8a32b62daecd587f29ff7931f2.tar.gz glibc-74159dc58af2ce8a32b62daecd587f29ff7931f2.tar.xz glibc-74159dc58af2ce8a32b62daecd587f29ff7931f2.zip | |
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.
| -rw-r--r-- | nptl/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/Makefile | 5 | ||||
| -rw-r--r-- | sysdeps/pthread/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-mutex1.c (renamed from nptl/tst-mutex1.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-mutex10.c (renamed from nptl/tst-mutex10.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-mutex2.c (renamed from nptl/tst-mutex2.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-mutex3.c (renamed from nptl/tst-mutex3.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-mutex4.c (renamed from nptl/tst-mutex4.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-mutex6.c (renamed from nptl/tst-mutex6.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-mutex8.c (renamed from nptl/tst-mutex8.c) | 0 |
10 files changed, 8 insertions, 3 deletions
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 index dba1f5fad6..dba1f5fad6 100644 --- a/nptl/tst-mutex1.c +++ b/sysdeps/pthread/tst-mutex1.c diff --git a/nptl/tst-mutex10.c b/sysdeps/pthread/tst-mutex10.c index 646ef13bb3..646ef13bb3 100644 --- a/nptl/tst-mutex10.c +++ b/sysdeps/pthread/tst-mutex10.c diff --git a/nptl/tst-mutex2.c b/sysdeps/pthread/tst-mutex2.c index 10a586f8ee..10a586f8ee 100644 --- a/nptl/tst-mutex2.c +++ b/sysdeps/pthread/tst-mutex2.c diff --git a/nptl/tst-mutex3.c b/sysdeps/pthread/tst-mutex3.c index d18ebb2f10..d18ebb2f10 100644 --- a/nptl/tst-mutex3.c +++ b/sysdeps/pthread/tst-mutex3.c diff --git a/nptl/tst-mutex4.c b/sysdeps/pthread/tst-mutex4.c index 8ac6666fa0..8ac6666fa0 100644 --- a/nptl/tst-mutex4.c +++ b/sysdeps/pthread/tst-mutex4.c diff --git a/nptl/tst-mutex6.c b/sysdeps/pthread/tst-mutex6.c index 2b06d10586..2b06d10586 100644 --- a/nptl/tst-mutex6.c +++ b/sysdeps/pthread/tst-mutex6.c diff --git a/nptl/tst-mutex8.c b/sysdeps/pthread/tst-mutex8.c index 8e56ea5a3a..8e56ea5a3a 100644 --- a/nptl/tst-mutex8.c +++ b/sysdeps/pthread/tst-mutex8.c |