aboutsummaryrefslogtreecommitdiff
path: root/nptl/Makefile
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-10 20:29:21 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2020-06-10 21:34:19 +0000
commit62d97c34320923f31380cb7851c81c5c9ce5284e (patch)
tree6f7c8ab2ba12547424894796eae9a683895811a0 /nptl/Makefile
parentbc9cf8fbe8eafe375719ad869ab81609cfc3529c (diff)
downloadglibc-62d97c34320923f31380cb7851c81c5c9ce5284e.zip
glibc-62d97c34320923f31380cb7851c81c5c9ce5284e.tar.gz
glibc-62d97c34320923f31380cb7851c81c5c9ce5284e.tar.bz2
htl: Enable more cancel tests
* nptl/tst-cancel11.c, tst-cancel21-static.c, tst-cancel21.c, tst-cancel6.c, tst-cancelx11.c, tst-cancelx21.c, tst-cancelx6.c: Move to... * sysdeps/pthread: ... here. * nptl/Makefile: Move corresponding references and rules to... * sysdeps/pthread/Makefile: ... here.
Diffstat (limited to 'nptl/Makefile')
-rw-r--r--nptl/Makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 55cd147..c431ead 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -278,8 +278,8 @@ 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-cancel6 tst-cancel7 tst-cancel9 tst-cancel11 tst-cancel13 \
- tst-cancel16 tst-cancel17 tst-cancel20 tst-cancel21 tst-cancel24 \
+ tst-cancel7 tst-cancel9 tst-cancel13 \
+ tst-cancel16 tst-cancel17 tst-cancel20 tst-cancel24 \
tst-cancel-self tst-cancel-self-cancelstate \
tst-cleanup4 \
tst-signal3 \
@@ -358,9 +358,9 @@ endif
LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
-tests += tst-cancelx4 tst-cancelx5 tst-cancelx6 tst-cancelx7 tst-cancelx9 \
- tst-cancelx11 tst-cancelx13 \
- tst-cancelx16 tst-cancelx17 tst-cancelx20 tst-cancelx21 \
+tests += tst-cancelx4 tst-cancelx5 tst-cancelx7 tst-cancelx9 \
+ tst-cancelx13 \
+ tst-cancelx16 tst-cancelx17 tst-cancelx20 \
tst-cleanupx4
ifeq ($(build-shared),yes)
@@ -422,11 +422,11 @@ link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
$(common-objpfx)libc.a
tests-static += tst-stackguard1-static \
- tst-cancel21-static tst-cancel24-static \
+ tst-cancel24-static \
tst-mutex8-static tst-mutexpi8-static tst-sem11-static \
tst-sem12-static tst-cond11-static
-tests += tst-cancel21-static tst-cancel24-static
+tests += tst-cancel24-static
tests-internal += tst-sem11-static tst-sem12-static tst-stackguard1-static
xtests-static += tst-setuid1-static
@@ -477,15 +477,12 @@ CFLAGS-tst-cancelx5.c += -Wno-error
# implementation. For this we have to pass the -fexceptions parameter.
CFLAGS-tst-cancelx4.c += -fexceptions
CFLAGS-tst-cancelx5.c += -fexceptions
-CFLAGS-tst-cancelx6.c += -fexceptions
CFLAGS-tst-cancelx7.c += -fexceptions
CFLAGS-tst-cancelx9.c += -fexceptions
-CFLAGS-tst-cancelx11.c += -fexceptions
CFLAGS-tst-cancelx13.c += -fexceptions
CFLAGS-tst-cancelx16.c += -fexceptions
CFLAGS-tst-cancelx17.c += -fexceptions
CFLAGS-tst-cancelx20.c += -fexceptions -fasynchronous-unwind-tables
-CFLAGS-tst-cancelx21.c += -fexceptions -fasynchronous-unwind-tables
CFLAGS-tst-cleanupx4.c += -fexceptions
CFLAGS-tst-cleanupx4aux.c += -fexceptions
CFLAGS-tst-initializers1.c += -W -Wall -Werror