htl: Enable tst-cancel25 test

* 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.
This commit is contained in:
Samuel Thibault 2020-06-23 22:00:53 +00:00
parent ae725e3f9c
commit 9f6e508b42
3 changed files with 4 additions and 2 deletions

View File

@ -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 \

View File

@ -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

View File

@ -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);