diff options
| -rw-r--r-- | nptl/Makefile | 9 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/pthread/Makefile | 11 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-cancel16.c (renamed from nptl/tst-cancel16.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-cancel20.c (renamed from nptl/tst-cancel20.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-cancelx16.c (renamed from nptl/tst-cancelx16.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-cancelx20.c (renamed from nptl/tst-cancelx20.c) | 0 |
7 files changed, 11 insertions, 11 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 4602824bf1..5e62c77853 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -278,8 +278,7 @@ tests = tst-attr2 tst-attr3 tst-default-attr \ tst-sem17 \ tst-tsd3 tst-tsd4 \ tst-cancel4 tst-cancel4_1 tst-cancel4_2 tst-cancel5 \ - tst-cancel7 \ - tst-cancel16 tst-cancel17 tst-cancel20 tst-cancel24 \ + tst-cancel7 tst-cancel17 tst-cancel24 \ tst-cleanup4 \ tst-signal3 \ tst-exec4 tst-exec5 \ @@ -357,9 +356,7 @@ endif LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst -tests += tst-cancelx4 tst-cancelx5 tst-cancelx7 \ - tst-cancelx16 tst-cancelx17 tst-cancelx20 \ - tst-cleanupx4 +tests += tst-cancelx4 tst-cancelx5 tst-cancelx7 tst-cancelx17 tst-cleanupx4 ifeq ($(build-shared),yes) tests += tst-compat-forwarder tst-audit-threads @@ -476,9 +473,7 @@ CFLAGS-tst-cancelx5.c += -Wno-error CFLAGS-tst-cancelx4.c += -fexceptions CFLAGS-tst-cancelx5.c += -fexceptions CFLAGS-tst-cancelx7.c += -fexceptions -CFLAGS-tst-cancelx16.c += -fexceptions CFLAGS-tst-cancelx17.c += -fexceptions -CFLAGS-tst-cancelx20.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-cleanupx4.c += -fexceptions CFLAGS-tst-cleanupx4aux.c += -fexceptions CFLAGS-tst-initializers1.c += -W -Wall -Werror diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile index a67fe5d393..daeb85ba4f 100644 --- a/sysdeps/mach/hurd/i386/Makefile +++ b/sysdeps/mach/hurd/i386/Makefile @@ -107,6 +107,8 @@ ifeq ($(subdir),htl) # For bug 25521 # (setpshared support) test-xfail-tst-mutex4 = yes +test-xfail-tst-cancel16 = yes +test-xfail-tst-cancelx16 = yes test-xfail-tst-cond4 = yes test-xfail-tst-cond6 = yes test-xfail-tst-cond12 = yes diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index ed31ae8f4f..920d875420 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -55,8 +55,8 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-cancel-self-canceltype tst-cancel-self-testcancel \ tst-cancel1 tst-cancel2 tst-cancel3 \ tst-cancel6 tst-cancel8 tst-cancel9 tst-cancel10 tst-cancel11 \ - tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 tst-cancel18 \ - tst-cancel19 tst-cancel21 \ + tst-cancel12 tst-cancel13 tst-cancel14 tst-cancel15 tst-cancel16 \ + tst-cancel18 tst-cancel19 tst-cancel20 tst-cancel21 \ tst-cancel22 tst-cancel23 tst-cancel26 tst-cancel27 tst-cancel28 \ tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \ tst-clock1 \ @@ -118,7 +118,7 @@ CFLAGS-tst-cleanupx2.c += -fno-builtin tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx9 \ tst-cancelx10 tst-cancelx11 tst-cancelx12 tst-cancelx13 tst-cancelx14 \ - tst-cancelx15 tst-cancelx18 tst-cancelx21 \ + tst-cancelx15 tst-cancelx16 tst-cancelx18 tst-cancelx20 tst-cancelx21 \ tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 ifeq ($(build-shared),yes) @@ -137,7 +137,8 @@ ifeq ($(build-shared),yes) tests: $(test-modules) endif -tests-static += tst-locale1 tst-locale2 tst-cancel21-static \ + +tests-static += tst-locale1 tst-locale2 tst-cancel21-static tests += tst-cancel21-static tst-cond11-static @@ -163,7 +164,9 @@ CFLAGS-tst-cancelx12.c += -fexceptions CFLAGS-tst-cancelx13.c += -fexceptions CFLAGS-tst-cancelx14.c += -fexceptions CFLAGS-tst-cancelx15.c += -fexceptions +CFLAGS-tst-cancelx16.c += -fexceptions CFLAGS-tst-cancelx18.c += -fexceptions +CFLAGS-tst-cancelx20.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-cancelx21.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-cleanupx0.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-cleanupx1.c += -fexceptions -fasynchronous-unwind-tables diff --git a/nptl/tst-cancel16.c b/sysdeps/pthread/tst-cancel16.c index 89e033808f..89e033808f 100644 --- a/nptl/tst-cancel16.c +++ b/sysdeps/pthread/tst-cancel16.c diff --git a/nptl/tst-cancel20.c b/sysdeps/pthread/tst-cancel20.c index ca8badc697..ca8badc697 100644 --- a/nptl/tst-cancel20.c +++ b/sysdeps/pthread/tst-cancel20.c diff --git a/nptl/tst-cancelx16.c b/sysdeps/pthread/tst-cancelx16.c index 99af3b197c..99af3b197c 100644 --- a/nptl/tst-cancelx16.c +++ b/sysdeps/pthread/tst-cancelx16.c diff --git a/nptl/tst-cancelx20.c b/sysdeps/pthread/tst-cancelx20.c index 6bd86376ca..6bd86376ca 100644 --- a/nptl/tst-cancelx20.c +++ b/sysdeps/pthread/tst-cancelx20.c |