diff mbox series

[hurd,commited,6/6] htl: Enable more cancellation tests

Message ID	20200614165757.4156687-7-samuel.thibault@ens-lyon.org
State	Committed, archived
Headers	DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EFA33395C82B From: Samuel Thibault <samuel.thibault@ens-lyon.org> To: libc-alpha@sourceware.org Subject: [hurd,commited 6/6] htl: Enable more cancellation tests Date: Sun, 14 Jun 2020 18:57:57 +0200 Message-Id: <20200614165757.4156687-7-samuel.thibault@ens-lyon.org> In-Reply-To: <20200614165757.4156687-1-samuel.thibault@ens-lyon.org> References: <20200614165757.4156687-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Cc: commit-hurd@gnu.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org>
Series	Make write and pwrite64 cancellation points \| [hurd,commited,0/6] Make write and pwrite64 cancellation points [hurd,commited,1/6] htl: Add noreturn attribute on __pthread_exit forward [hurd,commited,2/6] htl: initialize first and prevent from unloading [hurd,commited,3/6] htl: Move cleanup stack to variable shared between libc and pthread [hurd,commited,4/6] htl: Fix cleanup support for IO locking [hurd,commited,5/6] hurd: Make write and pwrite64 cancellation points [hurd,commited,6/6] htl: Enable more cancellation tests

Commit Message

Samuel Thibault June 14, 2020, 4:57 p.m. UTC

  * 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.
---
 nptl/Makefile                                           | 3 +--
 sysdeps/pthread/Makefile                                | 8 +++++---
 {nptl => sysdeps/pthread}/tst-cancel-self-cancelstate.c | 0
 {nptl => sysdeps/pthread}/tst-cancel-self.c             | 0
 {nptl => sysdeps/pthread}/tst-cancel9.c                 | 0
 {nptl => sysdeps/pthread}/tst-cancelx9.c                | 0
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename {nptl => sysdeps/pthread}/tst-cancel-self-cancelstate.c (100%)
 rename {nptl => sysdeps/pthread}/tst-cancel-self.c (100%)
 rename {nptl => sysdeps/pthread}/tst-cancel9.c (100%)
 rename {nptl => sysdeps/pthread}/tst-cancelx9.c (100%)

Comments

Andreas Schwab June 17, 2020, 1:26 p.m. UTC | #1

../Rules:219: target '/suse/schwab/src/libc/test/nptl/tst-cancelx9' given more than once in the same rule

Andreas.

Samuel Thibault June 17, 2020, 1:58 p.m. UTC | #2

Andreas Schwab, le mer. 17 juin 2020 15:26:30 +0200, a ecrit:
> ../Rules:219: target '/suse/schwab/src/libc/test/nptl/tst-cancelx9' given more than once in the same rule

It seems I missed the "remove" part of the move of that commit indeed,
now fixed.

Thanks,
Samuel

diff mbox series

Patch

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
similarity index 100%
rename from nptl/tst-cancel-self-cancelstate.c
rename to sysdeps/pthread/tst-cancel-self-cancelstate.c
diff --git a/nptl/tst-cancel-self.c b/sysdeps/pthread/tst-cancel-self.c
similarity index 100%
rename from nptl/tst-cancel-self.c
rename to sysdeps/pthread/tst-cancel-self.c
diff --git a/nptl/tst-cancel9.c b/sysdeps/pthread/tst-cancel9.c
similarity index 100%
rename from nptl/tst-cancel9.c
rename to sysdeps/pthread/tst-cancel9.c
diff --git a/nptl/tst-cancelx9.c b/sysdeps/pthread/tst-cancelx9.c
similarity index 100%
rename from nptl/tst-cancelx9.c
rename to sysdeps/pthread/tst-cancelx9.c