tests: factor out common shell code to functions
Factor out shell code used in several tests to common functions.
* tests/fanotify_mark.expected: New file.
* tests/ioctl.expected: New file.
* tests/net-fd.expected: New file.
* tests/net.expected: New file.
* tests/statfs.expected: New file.
* tests/sun_path.expected: New file.
* tests/uio.expected: New file.
* tests/ipc.sh: New file.
* tests/Makefile.am (EXTRA_DIST): Add them.
* tests/init.sh (dump_log_and_fail_with, run_prog,
run_prog_skip_if_failed, run_strace, run_strace_merge,
match_awk, match_diff, match_grep): New functions.
* tests/*.test: Use them.
diff --git a/tests/strace-k.test b/tests/strace-k.test
index f757fb9..90d56dc 100755
--- a/tests/strace-k.test
+++ b/tests/strace-k.test
@@ -4,6 +4,9 @@
. "${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'
@@ -11,27 +14,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 getpid -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='getpid f3 f2 f1 f0 main '
-result=$(sed -n '1,/(main+0x[a-f0-9]\+) .*/ s/^.*(\([^+]\+\)+0x[a-f0-9]\+) .*/\1/p' $LOG |
+result=$(sed -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