diff options
| author | Roland McGrath <roland@hack.frob.com> | 2015-02-06 12:31:11 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2015-02-06 12:31:11 -0800 |
| commit | 022f481264c197e1b0f20faa58cc4c21ce099597 (patch) | |
| tree | d6c35ae76e9c8e8ce49fd5b33648dff188456191 | |
| parent | 1ac074e66e8ee0e548742fcc79a705284448aea6 (diff) | |
| download | glibc-022f481264c197e1b0f20faa58cc4c21ce099597.tar.gz glibc-022f481264c197e1b0f20faa58cc4c21ce099597.tar.xz glibc-022f481264c197e1b0f20faa58cc4c21ce099597.zip | |
NPTL: Conditionalize some sanity tests for SIGCANCEL/SIGSETXID.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/tst-cancel25.c | 2 | ||||
| -rw-r--r-- | nptl/tst-signal7.c | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 76bfa13b20..85e3010482 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2015-02-06 Roland McGrath <roland@hack.frob.com> + * nptl/tst-cancel25.c (tf2): Test for SIGCANCEL being blocked only if + it's defined. + * nptl/tst-signal7.c (do_test): Test SIGCANCEL only if it's defined. + Test SIGSETXID only if it's defined. + * nptl/tst-locale1.c (useless): Use SIGRTMIN only if it's defined. * rt/tst-timer2.c (do_test): Don't initialize SIGEV.sigev_signo, which diff --git a/nptl/tst-cancel25.c b/nptl/tst-cancel25.c index 00b99ad553..ed4205ec45 100644 --- a/nptl/tst-cancel25.c +++ b/nptl/tst-cancel25.c @@ -11,6 +11,7 @@ static pthread_t th2; static void * tf2 (void *arg) { +#ifdef SIGCANCEL sigset_t mask; if (pthread_sigmask (SIG_SETMASK, NULL, &mask) != 0) { @@ -22,6 +23,7 @@ tf2 (void *arg) 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); diff --git a/nptl/tst-signal7.c b/nptl/tst-signal7.c index b3889891cc..1fbf3dbf72 100644 --- a/nptl/tst-signal7.c +++ b/nptl/tst-signal7.c @@ -27,6 +27,7 @@ do_test (void) { int result = 0; +#ifdef SIGCANCEL errno = 0; if (sigaction (SIGCANCEL, NULL, NULL) == 0) { @@ -38,7 +39,9 @@ do_test (void) puts ("sigaction(SIGCANCEL) did not set errno to EINVAL"); result = 1; } +#endif +#ifdef SIGSETXID errno = 0; if (sigaction (SIGSETXID, NULL, NULL) == 0) { @@ -50,6 +53,7 @@ do_test (void) puts ("sigaction(SIGSETXID) did not set errno to EINVAL"); result = 1; } +#endif return result; } |