|
From: <sv...@va...> - 2009-03-17 06:23:06
|
Author: njn
Date: 2009-03-17 06:22:58 +0000 (Tue, 17 Mar 2009)
New Revision: 9457
Log:
Merge r9456 (pending change) from the DARWIN branch.
Modified:
trunk/none/tests/pending.c
trunk/none/tests/pending.stdout.exp
Modified: trunk/none/tests/pending.c
===================================================================
--- trunk/none/tests/pending.c 2009-03-17 06:19:43 UTC (rev 9456)
+++ trunk/none/tests/pending.c 2009-03-17 06:22:58 UTC (rev 9457)
@@ -45,11 +45,11 @@
sigprocmask(SIG_BLOCK, &all, NULL);
signal(SIGUSR1, handler);
- signal(SIGUSR2, handler);
+ signal(SIGHUP, handler);
printf("1: sending signal\n");
kill(getpid(), SIGUSR1);
- kill(getpid(), SIGUSR2);
+ kill(getpid(), SIGHUP);
printf("2: sleeping\n");
sleep(1);
@@ -69,7 +69,7 @@
return 1;
}
- printf("6: checking SIGUSR2 still pending...\n");
+ printf("6: checking SIGHUP still pending...\n");
# if HAVE_SIGWAITINFO
{
siginfo_t info;
@@ -77,8 +77,8 @@
perror("FAILED: sigwaitinfo failed");
return 1;
}
- if (info.si_signo != SIGUSR2) {
- fprintf(stderr, "FAILED: SIGUSR2 not still pending; got signal %d\n",
+ if (info.si_signo != SIGHUP) {
+ fprintf(stderr, "FAILED: SIGHUP not still pending; got signal %d\n",
info.si_signo);
return 1;
}
Modified: trunk/none/tests/pending.stdout.exp
===================================================================
--- trunk/none/tests/pending.stdout.exp 2009-03-17 06:19:43 UTC (rev 9456)
+++ trunk/none/tests/pending.stdout.exp 2009-03-17 06:22:58 UTC (rev 9457)
@@ -3,5 +3,5 @@
3: unblocking
4: got signal SIGUSR1
5: unblocked...
-6: checking SIGUSR2 still pending...
+6: checking SIGHUP still pending...
OK
|