strace: terminate itself if interrupted by a signal

[strace] / tests / rt_sigqueueinfo.c

diff --git a/tests/rt_sigqueueinfo.c b/tests/rt_sigqueueinfo.c
index be277a438fbf0fdaa672f533df62c7e869010862..a6aae29efd98ac3424ce558119df00f035ca6293 100644 (file)
--- a/tests/rt_sigqueueinfo.c
+++ b/tests/rt_sigqueueinfo.c
@@ -1,49 +1,31 @@
 /*
  * Copyright (c) 2015 Elvira Khabirova <lineprinter0@gmail.com>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
+#include "tests.h"
+#include <assert.h>
 #include <stdio.h>
 #include <signal.h>
 #include <unistd.h>
 
 int
-main (void)
+main(void)
 {
        struct sigaction sa = {
                .sa_handler = SIG_IGN
        };
        union sigval value = {
-               .sival_ptr = (void *) (unsigned long) 0xdeadbeefbadc0ded
+               .sival_ptr = (void *) (unsigned long) 0xdeadbeefbadc0dedULL
        };
        pid_t pid = getpid();
 
-       if (sigaction(SIGUSR1, &sa, NULL) == -1)
-               return 77;
-       if (sigqueue(pid, SIGUSR1, value) == -1)
-               return 77;
+       assert(sigaction(SIGUSR1, &sa, NULL) == 0);
+       if (sigqueue(pid, SIGUSR1, value))
+               perror_msg_and_skip("sigqueue");
        printf("rt_sigqueueinfo(%u, SIGUSR1, {si_signo=SIGUSR1, "
                "si_code=SI_QUEUE, si_pid=%u, si_uid=%u, "
                "si_value={int=%d, ptr=%p}}) = 0\n",