* [hurd,commited] htl: Enable tst-cancel25 test
@ 2020-06-23 22:03 Samuel Thibault
0 siblings, 0 replies; only message in thread
From: Samuel Thibault @ 2020-06-23 22:03 UTC (permalink / raw)
To: libc-alpha; +Cc: Samuel Thibault, commit-hurd
* nptl/tst-cancel25.c: Move to...
* sysdeps/pthread/tst-cancel25.c: ... here.
(tf2) Do not test for SIGCANCEL when it is not defined.
* nptl/Makefile: Move corresponding reference to...
* sysdeps/pthread/Makefile: ... here.
---
nptl/Makefile | 2 +-
sysdeps/pthread/Makefile | 2 +-
{nptl => sysdeps/pthread}/tst-cancel25.c | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
rename {nptl => sysdeps/pthread}/tst-cancel25.c (99%)
diff --git a/nptl/Makefile b/nptl/Makefile
index 60483c1ec4..24ebd07a30 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -307,7 +307,7 @@ tests-container = tst-pthread-getattr
tests-internal := tst-robustpi8 tst-rwlock19 tst-rwlock20 \
tst-sem11 tst-sem12 tst-sem13 \
tst-barrier5 tst-signal7 tst-mutex8 tst-mutex8-static \
- tst-mutexpi8 tst-mutexpi8-static tst-cancel25 \
+ tst-mutexpi8 tst-mutexpi8-static \
tst-setgetname \
xtests = tst-setuid1 tst-setuid1-static tst-setuid2 \
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index c9ba6f8f12..01602e69d5 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -214,7 +214,7 @@ generated += tst-atfork2.mtrace
generated += $(objpfx)tst-atfork2.mtrace \
$(addsuffix .so,$(strip $(modules-names)))
-tests-internal += tst-robust8
+tests-internal += tst-cancel25 tst-robust8
tests += tst-oncex3 tst-oncex4
diff --git a/nptl/tst-cancel25.c b/sysdeps/pthread/tst-cancel25.c
similarity index 99%
rename from nptl/tst-cancel25.c
rename to sysdeps/pthread/tst-cancel25.c
index c6e1c23c02..0b3a82b804 100644
--- a/nptl/tst-cancel25.c
+++ b/sysdeps/pthread/tst-cancel25.c
@@ -18,11 +18,13 @@ tf2 (void *arg)
puts ("pthread_sigmask failed");
exit (1);
}
+#ifdef SIGCANCEL
if (sigismember (&mask, SIGCANCEL))
{
puts ("SIGCANCEL blocked in new thread");
exit (1);
}
+#endif
/* Sync with the main thread so that we do not test anything else. */
int e = pthread_barrier_wait (&b);
--
2.27.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-23 22:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-23 22:03 [hurd,commited] htl: Enable tst-cancel25 test Samuel Thibault
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).