strace: terminate itself if interrupted by a signal

[strace] / tests / attach-f-p.c

diff --git a/tests/attach-f-p.c b/tests/attach-f-p.c
index 8a733d055f5a84cbd03b04fa7742510cae6ac3b2..3bfc99686bd0ceff85fb53bd9dcf67237a303a8c 100644 (file)
--- a/tests/attach-f-p.c
+++ b/tests/attach-f-p.c
@@ -4,27 +4,7 @@
  * Copyright (c) 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"
@@ -33,7 +13,8 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/syscall.h>
+#include <sys/stat.h>
+#include <asm/unistd.h>
 #include <unistd.h>
 
 #define N 3
@@ -71,7 +52,7 @@ main(void)
        pthread_t t[N];
        unsigned int i;
 
-       if (write(3, "", 0) != 0)
+       if (write(1, "", 0) != 0)
                perror_msg_and_fail("write");
 
        for (i = 0; i < N; ++i) {
@@ -83,9 +64,18 @@ main(void)
                        perror_msg_and_fail("pthread_create");
        }
 
-       if (write(3, "\n", 1) != 1)
+       if (write(1, "\n", 1) != 1)
                perror_msg_and_fail("write");
 
+       /* wait for the peer to write to stdout */
+       struct stat st;
+       for (;;) {
+               if (fstat(1, &st))
+                       perror_msg_and_fail("fstat");
+               if (st.st_size >= 103)
+                       break;
+       }
+
        for (i = 0; i < N; ++i) {
                /* sleep a bit to let the tracer catch up */
                sleep(1);
@@ -96,9 +86,9 @@ main(void)
                if (errno)
                        perror_msg_and_fail("pthread_join");
                errno = ENOENT;
-               printf("%-5d chdir(\"%s\") = -1 ENOENT (%m)\n"
+               printf("%-5d chdir(\"%s\") = %s\n"
                       "%-5d +++ exited with 0 +++\n",
-                      retval.pid, child[i], retval.pid);
+                      retval.pid, child[i], sprintrc(-1), retval.pid);
        }
 
        /* sleep a bit more to let the tracer catch up */