tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / strace-k.test

diff --git a/tests/strace-k.test b/tests/strace-k.test
index 329f30248f5e2cbdf3436c345c8a7a2f77491e48..e68951e8f1a567b35fa42ebfc3ded175b54efeee 100755 (executable)
--- a/tests/strace-k.test
+++ b/tests/strace-k.test
@@ -1,6 +1,33 @@
 #!/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-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.
 
 . "${srcdir=.}/init.sh"
 
@@ -11,27 +38,17 @@
 check_prog sed
 check_prog tr
 
-./stack-fcall ||
-       fail_ 'stack-fcall failed'
-
-$STRACE -h | grep '^-k' > /dev/null ||
-       skip_ 'strace -k is not available'
-
-args="-e getuid -k ./stack-fcall"
-$STRACE $args > $LOG 2>&1 || {
-       cat $LOG
-       fail_ "$STRACE $args failed"
-}
+run_prog ../stack-fcall
+run_strace -e getpid -k $args
 
-expected='getuid f1 f0 main '
-result=$(sed -n '1,/(main+0x[a-f0-9]\+) .*/ s/^.*(\([^+]\+\)+0x[a-f0-9]\+) .*/\1/p' $LOG |
+expected='getpid f3 f2 f1 f0 main '
+result=$(sed -r -n '1,/\(main\+0x[a-f0-9]+\) .*/ s/^.*\(([^+]+)\+0x[a-f0-9]+\) .*/\1/p' "$LOG" |
        tr '\n' ' ')
 
 test "$result" = "$expected" || {
-       cat $LOG
        echo "expected: \"$expected\""
        echo "result: \"$result\""
-       fail_ "unexpected output from $STRACE $args"
+       dump_log_and_fail_with "$STRACE $args output mismatch"
 }
 
 exit 0