strace: terminate itself if interrupted by a signal

[strace] / tests / pc.c

diff --git a/tests/pc.c b/tests/pc.c
index aef0bc39de8cda56b6fcbb20479be88ce768f731..6127ea18fda88fba32428452649212e56dbf66df 100644 (file)
--- a/tests/pc.c
+++ b/tests/pc.c
@@ -1,31 +1,12 @@
 /*
- * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
  * 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 <dlfcn.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -35,27 +16,25 @@
 
 int main(void)
 {
-       const unsigned long pagesize = sysconf(_SC_PAGESIZE);
+       const unsigned long pagesize = get_page_size();
 
 #ifdef __s390__
        /*
         * The si_addr field is unreliable:
         * https://marc.info/?l=linux-s390&m=142515870124248&w=2
         */
-       return 77;
+       error_msg_and_skip("s390: si_addr is unreliable");
 #endif
 
        /* write instruction pointer length to the log */
-       if (write(-1, NULL, 2 * sizeof(void *)) >= 0)
-               return 77;
+       assert(write(-1, NULL, 2 * sizeof(void *)) < 0);
 
        /* just a noticeable line in the log */
-       if (munmap(&main, 0) >= 0)
-               return 77;
+       assert(munmap(&main, 0) < 0);
 
        int pid = fork();
        if (pid < 0)
-               return 77;
+               perror_msg_and_fail("fork");
 
        if (!pid) {
                const unsigned long mask = ~(pagesize - 1);
@@ -81,14 +60,13 @@ int main(void)
                /* SIGSEGV is expected */
                (void) munmap((void *) addr, size);
                (void) munmap((void *) addr, size);
-               return 77;
+               error_msg_and_skip("SIGSEGV did not happen");
        }
 
        int status;
-       if (wait(&status) != pid ||
-           !WIFSIGNALED(status) ||
-           WTERMSIG(status) != SIGSEGV)
-               return 77;
+       assert(wait(&status) == pid);
+       assert(WIFSIGNALED(status));
+       assert(WTERMSIG(status) == SIGSEGV);
 
        /* dump process map for debug purposes */
        close(0);