From 62d97c34320923f31380cb7851c81c5c9ce5284e Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Wed, 10 Jun 2020 20:29:21 +0000 Subject: [PATCH] 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. --- nptl/Makefile | 17 +++++++---------- sysdeps/pthread/Makefile | 17 +++++++++++------ {nptl => sysdeps/pthread}/tst-cancel11.c | 0 {nptl => sysdeps/pthread}/tst-cancel21-static.c | 0 {nptl => sysdeps/pthread}/tst-cancel21.c | 0 {nptl => sysdeps/pthread}/tst-cancel6.c | 0 {nptl => sysdeps/pthread}/tst-cancelx11.c | 0 {nptl => sysdeps/pthread}/tst-cancelx21.c | 0 {nptl => sysdeps/pthread}/tst-cancelx6.c | 0 9 files changed, 18 insertions(+), 16 deletions(-) rename {nptl => sysdeps/pthread}/tst-cancel11.c (100%) rename {nptl => sysdeps/pthread}/tst-cancel21-static.c (100%) rename {nptl => sysdeps/pthread}/tst-cancel21.c (100%) rename {nptl => sysdeps/pthread}/tst-cancel6.c (100%) rename {nptl => sysdeps/pthread}/tst-cancelx11.c (100%) rename {nptl => sysdeps/pthread}/tst-cancelx21.c (100%) rename {nptl => sysdeps/pthread}/tst-cancelx6.c (100%) diff --git a/nptl/Makefile b/nptl/Makefile index 55cd147f8c..c431ead1c0 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 diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 8d094b2221..a8e83d9d16 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -52,8 +52,10 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \ tst-basic7 \ tst-cancel-self-canceltype tst-cancel-self-testcancel \ - tst-cancel1 tst-cancel2 tst-cancel3 tst-cancel8 tst-cancel10 \ + tst-cancel1 tst-cancel2 tst-cancel3 \ + tst-cancel6 tst-cancel8 tst-cancel10 tst-cancel11 \ tst-cancel12 tst-cancel14 tst-cancel15 tst-cancel18 tst-cancel19 \ + tst-cancel21 \ tst-cancel22 tst-cancel23 tst-cancel26 tst-cancel27 tst-cancel28 \ tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \ tst-clock1 \ @@ -113,8 +115,9 @@ tests-nolibpthread = tst-unload CFLAGS-tst-cleanup2.c += -fno-builtin CFLAGS-tst-cleanupx2.c += -fno-builtin -tests += tst-cancelx2 tst-cancelx3 tst-cancelx8 tst-cancelx10 \ - tst-cancelx12 tst-cancelx14 tst-cancelx15 tst-cancelx18 \ +tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx10 \ + tst-cancelx11 tst-cancelx12 tst-cancelx14 tst-cancelx15 \ + tst-cancelx18 tst-cancelx21 \ tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 ifeq ($(build-shared),yes) @@ -133,10 +136,9 @@ ifeq ($(build-shared),yes) tests: $(test-modules) endif -tests-static += tst-locale1 tst-locale2 - -tests += tst-cond11-static +tests-static += tst-locale1 tst-locale2 tst-cancel21-static \ +tests += tst-cancel21-static tst-cond11-static # These tests are linked with libc before libpthread tests-reverse += tst-cancel23 tst-vfork1x tst-vfork2x @@ -151,12 +153,15 @@ endif # implementation. For this we have to pass the -fexceptions parameter. CFLAGS-tst-cancelx2.c += -fexceptions CFLAGS-tst-cancelx3.c += -fexceptions +CFLAGS-tst-cancelx6.c += -fexceptions CFLAGS-tst-cancelx8.c += -fexceptions CFLAGS-tst-cancelx10.c += -fexceptions +CFLAGS-tst-cancelx11.c += -fexceptions CFLAGS-tst-cancelx12.c += -fexceptions CFLAGS-tst-cancelx14.c += -fexceptions CFLAGS-tst-cancelx15.c += -fexceptions CFLAGS-tst-cancelx18.c += -fexceptions +CFLAGS-tst-cancelx21.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-cleanupx0.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-cleanupx1.c += -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-cleanupx2.c += -fexceptions diff --git a/nptl/tst-cancel11.c b/sysdeps/pthread/tst-cancel11.c similarity index 100% rename from nptl/tst-cancel11.c rename to sysdeps/pthread/tst-cancel11.c diff --git a/nptl/tst-cancel21-static.c b/sysdeps/pthread/tst-cancel21-static.c similarity index 100% rename from nptl/tst-cancel21-static.c rename to sysdeps/pthread/tst-cancel21-static.c diff --git a/nptl/tst-cancel21.c b/sysdeps/pthread/tst-cancel21.c similarity index 100% rename from nptl/tst-cancel21.c rename to sysdeps/pthread/tst-cancel21.c diff --git a/nptl/tst-cancel6.c b/sysdeps/pthread/tst-cancel6.c similarity index 100% rename from nptl/tst-cancel6.c rename to sysdeps/pthread/tst-cancel6.c diff --git a/nptl/tst-cancelx11.c b/sysdeps/pthread/tst-cancelx11.c similarity index 100% rename from nptl/tst-cancelx11.c rename to sysdeps/pthread/tst-cancelx11.c diff --git a/nptl/tst-cancelx21.c b/sysdeps/pthread/tst-cancelx21.c similarity index 100% rename from nptl/tst-cancelx21.c rename to sysdeps/pthread/tst-cancelx21.c diff --git a/nptl/tst-cancelx6.c b/sysdeps/pthread/tst-cancelx6.c similarity index 100% rename from nptl/tst-cancelx6.c rename to sysdeps/pthread/tst-cancelx6.c