diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-14 16:15:39 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-14 16:16:59 +0000 |
| commit | 45fce058fe7c9a14800a10564a7bc1970f4c7c49 (patch) | |
| tree | 73beb97bba4d931136d3d5d5d3c8f114846dd049 | |
| parent | 662de0889a040e3ebeefcfdde547edc8a11f87d7 (diff) | |
| download | glibc-45fce058fe7c9a14800a10564a7bc1970f4c7c49.tar.gz | |
htl: Enable more cancellation tests
* nptl/tst-cancel-self-cancelstate.c, tst-cancel-self.c, tst-cancel9.c,
tst-cancelx9.c: Move to...
* sysdeps/pthread: ... here.
* nptl/Makefile: Move corresponding references and rules to...
* sysdeps/pthread/Makefile: ... here.
| -rw-r--r-- | nptl/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/pthread/Makefile | 8 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-cancel-self-cancelstate.c (renamed from nptl/tst-cancel-self-cancelstate.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-cancel-self.c (renamed from nptl/tst-cancel-self.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-cancel9.c (renamed from nptl/tst-cancel9.c) | 0 | ||||
| -rw-r--r-- | sysdeps/pthread/tst-cancelx9.c (renamed from nptl/tst-cancelx9.c) | 0 |
6 files changed, 6 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index c431ead1c0..3356f2aa11 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -278,9 +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-cancel7 tst-cancel9 tst-cancel13 \ + tst-cancel7 tst-cancel13 \ tst-cancel16 tst-cancel17 tst-cancel20 tst-cancel24 \ - tst-cancel-self tst-cancel-self-cancelstate \ tst-cleanup4 \ tst-signal3 \ tst-exec4 tst-exec5 \ diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index a8e83d9d16..c9ba6f8f12 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -51,9 +51,10 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-barrier1 tst-barrier2 tst-barrier3 tst-barrier4 \ tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \ tst-basic7 \ + tst-cancel-self tst-cancel-self-cancelstate \ tst-cancel-self-canceltype tst-cancel-self-testcancel \ tst-cancel1 tst-cancel2 tst-cancel3 \ - tst-cancel6 tst-cancel8 tst-cancel10 tst-cancel11 \ + tst-cancel6 tst-cancel8 tst-cancel9 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 \ @@ -115,8 +116,8 @@ tests-nolibpthread = tst-unload CFLAGS-tst-cleanup2.c += -fno-builtin CFLAGS-tst-cleanupx2.c += -fno-builtin -tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx10 \ - tst-cancelx11 tst-cancelx12 tst-cancelx14 tst-cancelx15 \ +tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx9 \ + tst-cancelx10 tst-cancelx11 tst-cancelx12 tst-cancelx14 tst-cancelx15 \ tst-cancelx18 tst-cancelx21 \ tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 @@ -155,6 +156,7 @@ CFLAGS-tst-cancelx2.c += -fexceptions CFLAGS-tst-cancelx3.c += -fexceptions CFLAGS-tst-cancelx6.c += -fexceptions CFLAGS-tst-cancelx8.c += -fexceptions +CFLAGS-tst-cancelx9.c += -fexceptions CFLAGS-tst-cancelx10.c += -fexceptions CFLAGS-tst-cancelx11.c += -fexceptions CFLAGS-tst-cancelx12.c += -fexceptions diff --git a/nptl/tst-cancel-self-cancelstate.c b/sysdeps/pthread/tst-cancel-self-cancelstate.c index d1d2b50cf0..d1d2b50cf0 100644 --- a/nptl/tst-cancel-self-cancelstate.c +++ b/sysdeps/pthread/tst-cancel-self-cancelstate.c diff --git a/nptl/tst-cancel-self.c b/sysdeps/pthread/tst-cancel-self.c index 9d7316d5ca..9d7316d5ca 100644 --- a/nptl/tst-cancel-self.c +++ b/sysdeps/pthread/tst-cancel-self.c diff --git a/nptl/tst-cancel9.c b/sysdeps/pthread/tst-cancel9.c index 02d7c3a091..02d7c3a091 100644 --- a/nptl/tst-cancel9.c +++ b/sysdeps/pthread/tst-cancel9.c diff --git a/nptl/tst-cancelx9.c b/sysdeps/pthread/tst-cancelx9.c index 9d84663d77..9d84663d77 100644 --- a/nptl/tst-cancelx9.c +++ b/sysdeps/pthread/tst-cancelx9.c |