strace: terminate itself if interrupted by a signal

[strace] / tests / strace-k.test

diff --git a/tests/strace-k.test b/tests/strace-k.test
index 90d56dc2a6e4b2b64ddc6772e739a1fbe0c54e83..43fddb56f7eb330b1be3bb057c1ab77864ff16cd 100755 (executable)
--- a/tests/strace-k.test
+++ b/tests/strace-k.test
@@ -1,30 +1,80 @@
 #!/bin/sh
-
+#
 # Ensure that strace -k works.
+#
+# Copyright (c) 2014 Masatake YAMATO <yamato@redhat.com>
+# Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
+# Copyright (c) 2014-2018 The strace developers.
+# All rights reserved.
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 . "${srcdir=.}/init.sh"
 
-$STRACE -h | grep '^-k' > /dev/null ||
-       skip_ 'strace -k is not available'
-
 # strace -k is implemented using /proc/$pid/maps
 [ -f /proc/self/maps ] ||
        framework_skip_ '/proc/self/maps is not available'
 
+check_prog grep
 check_prog sed
 check_prog tr
 
-run_prog ./stack-fcall
+run_prog "${test_prog=../stack-fcall}"
 run_strace -e getpid -k $args
 
-expected='getpid f3 f2 f1 f0 main '
-result=$(sed -n '1,/(main+0x[a-f0-9]\+) .*/ s/^.*(\([^+]\+\)+0x[a-f0-9]\+) .*/\1/p' "$LOG" |
-       tr '\n' ' ')
+expected="$srcdir/$NAME.expected"
+awk '
+/^[^ ]/ {
+       if (out != "")
+               print out
 
-test "$result" = "$expected" || {
-       echo "expected: \"$expected\""
-       echo "result: \"$result\""
-       dump_log_and_fail_with "$STRACE $args output mismatch"
+       syscall = gensub(/^([[:alnum:]_]+)\(.*/, "\\1", 1)
+       signal = gensub(/^--- ([A-Z]+) .*/, "\\1", 1)
+
+       if (syscall != $0) {
+               out = syscall
+               stop = 0
+       } else if (signal != $0) {
+               out = signal
+               stop = 0
+       } else {
+               out = ""
+       }
 }
 
-exit 0
+/^ >[^(]+\(([^+]+)\+0x[a-f0-9]+\) / && !stop {
+       sym = gensub(/^ >[^(]+\(([^+]+)\+0x[a-f0-9]+\) .*$/, "\\1", 1)
+       out = out " " sym
+       if (sym == "main")
+               stop = 1
+}' "$LOG" > "$OUT"
+
+LC_ALL=C grep -E -x -f "$expected" < "$OUT" > /dev/null || {
+       cat >&2 <<__EOF__
+Failed pattern of expected output:
+$(cat "$expected")
+Actual output:
+$(cat "$OUT")
+__EOF__
+
+       pattern=
+       case "$STRACE_ARCH" in
+               aarch64|i386|ppc*|s390*|sparc*|x32|x86*)
+                       # These architectures are supported by elfutils libdw,
+                       # see grep '\<HOOK\>.*\<abi_cfi\>' elfutils/backends
+                       ;;
+               arm) pattern='No DWARF information found'
+                       # This is also supported by elfutils libdw
+                       # but the latter needs debuginfo for unwinding.
+                       ;;
+               *) pattern='Unwinding not supported for this architecture'
+                       ;;
+       esac
+       if [ -n "$pattern" ] &&
+          LC_ALL=C grep -x " > $pattern" < "$LOG" > /dev/null; then
+               cat < "$LOG" >&2
+               skip_ "stack tracing is not fully supported on $STRACE_ARCH yet"
+       fi
+
+       dump_log_and_fail_with "$STRACE $args output mismatch"
+}