Merge r9456 (pending change) from the DARWIN branch.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@9457

diff --git a/none/tests/pending.c b/none/tests/pending.c
index 05c449b474f55dca2f8bca0a452a48b61875e205..438a1bbf61f2b7d93961dcce16878902b11e0636 100644 (file)
--- a/none/tests/pending.c
+++ b/none/tests/pending.c
@@ -45,11 +45,11 @@ int main()
        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 @@ int main()
                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 @@ int main()
                        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;
                }

diff --git a/none/tests/pending.stdout.exp b/none/tests/pending.stdout.exp
index 5494d3505927b5863ce7d62729570966ad55717d..90db356d76ba51d3eb2d03f1a87b160b12240ccc 100644 (file)
--- a/none/tests/pending.stdout.exp
+++ b/none/tests/pending.stdout.exp
@@ -3,5 +3,5 @@
 3: unblocking
 4: got signal SIGUSR1
 5: unblocked...
-6: checking SIGUSR2 still pending...
+6: checking SIGHUP still pending...
 OK