tests: factor out a part common to many simply organized test scripts

* tests/init.sh (run_strace_match_diff): New function.
* tests/acct.test: Rewrite using run_strace_match_diff.
* tests/aio.test: Likewise.
* tests/alarm.test: Likewise.
* tests/chmod.test: Likewise.
* tests/clock_nanosleep.test: Likewise.
* tests/clock_xettime.test: Likewise.
* tests/copy_file_range.test: Likewise.
* tests/creat.test: Likewise.
* tests/dup.test: Likewise.
* tests/dup2.test: Likewise.
* tests/dup3.test: Likewise.
* tests/epoll_create1.test: Likewise.
* tests/execveat-v.test: Likewise.
* tests/execveat.test: Likewise.
* tests/fchmod.test: Likewise.
* tests/fcntl.test: Likewise.
* tests/file_handle.test: Likewise.
* tests/flock.test: Likewise.
* tests/fork-f.test: Likewise.
* tests/ftruncate.test: Likewise.
* tests/ftruncate64.test: Likewise.
* tests/getcwd.test: Likewise.
* tests/getdents.test: Likewise.
* tests/getdents64.test: Likewise.
* tests/getrandom.test: Likewise.
* tests/getrusage.test: Likewise.
* tests/getxxid.test: Likewise.
* tests/inet-cmsg.test: Likewise.
* tests/init.sh: Likewise.
* tests/membarrier.test: Likewise.
* tests/mincore.test: Likewise.
* tests/mknod.test: Likewise.
* tests/mlock2.test: Likewise.
* tests/mmsg.test: Likewise.
* tests/nanosleep.test: Likewise.
* tests/open.test: Likewise.
* tests/openat.test: Likewise.
* tests/pselect6.test: Likewise.
* tests/readdir.test: Likewise.
* tests/readlink.test: Likewise.
* tests/readv.test: Likewise.
* tests/recvmsg.test: Likewise.
* tests/rename.test: Likewise.
* tests/renameat.test: Likewise.
* tests/rt_sigpending.test: Likewise.
* tests/rt_sigprocmask.test: Likewise.
* tests/rt_sigqueueinfo.test: Likewise.
* tests/rt_sigsuspend.test: Likewise.
* tests/rt_sigtimedwait.test: Likewise.
* tests/rt_tgsigqueueinfo.test: Likewise.
* tests/sched_get_priority_mxx.test: Likewise.
* tests/sched_xetaffinity.test: Likewise.
* tests/sched_xetparam.test: Likewise.
* tests/sched_xetscheduler.test: Likewise.
* tests/seccomp.test: Likewise.
* tests/select.test: Likewise.
* tests/sendfile.test: Likewise.
* tests/sendfile64.test: Likewise.
* tests/splice.test: Likewise.
* tests/statx.sh: Likewise.
* tests/sysinfo.test: Likewise.
* tests/syslog.test: Likewise.
* tests/tee.test: Likewise.
* tests/time.test: Likewise.
* tests/timer_create.test: Likewise.
* tests/timer_xettime.test: Likewise.
* tests/timerfd_xettime.test: Likewise.
* tests/times-fail.test: Likewise.
* tests/times.test: Likewise.
* tests/truncate.test: Likewise.
* tests/truncate64.test: Likewise.
* tests/umask.test: Likewise.
* tests/umount.test: Likewise.
* tests/umount2.test: Likewise.
* tests/userfaultfd.test: Likewise.
* tests/vmsplice.test: Likewise.
* tests/xet_robust_list.test: Likewise.
* tests/xetitimer.test: Likewise.
* tests/xetpgid.test: Likewise.
* tests/xetpriority.test: Likewise.
* tests/xettimeofday.test: Likewise.

diff --git a/tests/acct.test b/tests/acct.test
index 4abd8bc6bbf1d0288d6bbf3b6a976d088fcdeabe..e68a6ca15555c1ac4c46500755b815d782bec741 100755 (executable)
--- a/tests/acct.test
+++ b/tests/acct.test
@@ -3,8 +3,4 @@
 # Check acct syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -eacct -a21 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a21

diff --git a/tests/aio.test b/tests/aio.test
index 8b73395a4ca9235fef3e52de388790694aaa8e69..2ba90da8dd361362aaf580c107bece837a2a8394 100755 (executable)
--- a/tests/aio.test
+++ b/tests/aio.test
@@ -4,10 +4,5 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog > /dev/null
 syscalls=io_setup,io_submit,io_getevents,io_cancel,io_destroy
-run_strace -a14 -e trace=$syscalls $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a14 -e trace=$syscalls

diff --git a/tests/alarm.test b/tests/alarm.test
index 621122f68090c5732d6e8783c434958f9192b101..267b22393e7976016737ffca61de17362f9e2b3d 100755 (executable)
--- a/tests/alarm.test
+++ b/tests/alarm.test
@@ -3,8 +3,4 @@
 # Check alarm syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a10 -ealarm $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a10

diff --git a/tests/chmod.test b/tests/chmod.test
index c14bcf637e6bd6d50bdbdbfab67d47502ee7c521..70e561a1e69d58d0e8a711735db6e416e5913b8c 100755 (executable)
--- a/tests/chmod.test
+++ b/tests/chmod.test
@@ -3,10 +3,4 @@
 # Check chmod syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a28 -echmod $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a28

diff --git a/tests/clock_nanosleep.test b/tests/clock_nanosleep.test
index 1eafd4f04fdb3d1360f10c41922486e8b195e157..ec434a60ddce9ae45257abe66b5b1b1180291f1c 100755 (executable)
--- a/tests/clock_nanosleep.test
+++ b/tests/clock_nanosleep.test
@@ -1,13 +1,6 @@
 #!/bin/sh
 
-# Check clock_nanosleep syscall decoding.
+# Check clock_nanosleep, clock_gettime, and setitimer syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscalls=clock_nanosleep,clock_gettime,setitimer
-run_strace -e trace=$syscalls $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -e trace=clock_nanosleep,clock_gettime,setitimer

diff --git a/tests/clock_xettime.test b/tests/clock_xettime.test
index 34569ccfdbeb70267a8791a84f001aca4297a608..f045a66e87c950b86f90585d52751797b412476c 100755 (executable)
--- a/tests/clock_xettime.test
+++ b/tests/clock_xettime.test
@@ -3,11 +3,4 @@
 # Check clock_getres, clock_gettime, and clock_settime syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscalls=clock_getres,clock_gettime,clock_settime
-run_strace -a36 -e trace=$syscalls $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a36 -e trace=clock_getres,clock_gettime,clock_settime

diff --git a/tests/copy_file_range.test b/tests/copy_file_range.test
index f431927be27d73ff526407c15dfeb0646838daf5..c39f6acdfef4a5e6fda57ac80e96f8acbc59bfc0 100755 (executable)
--- a/tests/copy_file_range.test
+++ b/tests/copy_file_range.test
@@ -3,8 +3,4 @@
 # Check copy_file_range syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -ecopy_file_range $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff

diff --git a/tests/creat.test b/tests/creat.test
index 54beff7a2585e83220f1869307f9db05acb7837c..49fddd215a29f2c123e86d5d6b57be5ae7debd9c 100755 (executable)
--- a/tests/creat.test
+++ b/tests/creat.test
@@ -3,8 +3,4 @@
 # Check creat syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -ecreat -a21 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a21

diff --git a/tests/dup.test b/tests/dup.test
index 839906d8d702779390e757ddab27834f89b92adc..1dc19198a5b813bac65bb9aa84c8ed7e930b0552 100755 (executable)
--- a/tests/dup.test
+++ b/tests/dup.test
@@ -3,8 +3,4 @@
 # Check dup syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -edup -a8 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a8

diff --git a/tests/dup2.test b/tests/dup2.test
index d90eb6db1a32879c4eb25cb77dcea5e9191afa14..509c5db13d12e82fdb9d9b523ebbeee14ad8fd68 100755 (executable)
--- a/tests/dup2.test
+++ b/tests/dup2.test
@@ -3,8 +3,4 @@
 # Check dup2 syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -edup2 -a13 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a13

diff --git a/tests/dup3.test b/tests/dup3.test
index d4f17dff43682a3a9aca8a1a0b78aa8dd1e8aa33..293f78f9fd4e08214ddd26af71dd8f3bf414efe3 100755 (executable)
--- a/tests/dup3.test
+++ b/tests/dup3.test
@@ -3,8 +3,4 @@
 # Check dup3 syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -edup3 -a24 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a24

diff --git a/tests/epoll_create1.test b/tests/epoll_create1.test
index 052c20d9685c70e1a6e0e297f7afb758583dc268..7a926a97db00c1994eef8981fa8c1972a021ea53 100755 (executable)
--- a/tests/epoll_create1.test
+++ b/tests/epoll_create1.test
@@ -3,10 +3,4 @@
 # Check epoll_create1 syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a28 -eepoll_create1 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a28

diff --git a/tests/execveat-v.test b/tests/execveat-v.test
index f7f0ce09c25f4e24d0d338a049e24d88d6dd87c4..a90522485d90c5adab64300724efc8f4f6689976 100755 (executable)
--- a/tests/execveat-v.test
+++ b/tests/execveat-v.test
@@ -3,8 +3,4 @@
 # Check verbose decoding of execveat syscall.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -veexecveat $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -v -e trace=execveat

diff --git a/tests/execveat.test b/tests/execveat.test
index 50a0bae8bcccd0ef98e72ffe305f07da4d01f362..879e03e2a60ee778fed064f3a00805bc9a90202d 100755 (executable)
--- a/tests/execveat.test
+++ b/tests/execveat.test
@@ -3,8 +3,4 @@
 # Check execveat syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -eexecveat $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff

diff --git a/tests/fchmod.test b/tests/fchmod.test
index e8fe393ed5c6ad50317c44ad0f597e7f23a9054b..32ad456cf5d73512e4eb1efef1f9210c46f01045 100755 (executable)
--- a/tests/fchmod.test
+++ b/tests/fchmod.test
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-. "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a16 -efchmod $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+# Check fchmod syscall decoding.
 
-exit 0
+. "${srcdir=.}/init.sh"
+run_strace_match_diff -a16

diff --git a/tests/fcntl.test b/tests/fcntl.test
index cbe8ef6a0269a07337b8ae3a1ba98abcb5c214c6..9aea122d705d0970685359ee9959f413b54a07f0 100755 (executable)
--- a/tests/fcntl.test
+++ b/tests/fcntl.test
@@ -3,11 +3,4 @@
 # Check fcntl decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscall=$NAME
-run_strace -a8 -e$syscall $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a8

diff --git a/tests/file_handle.test b/tests/file_handle.test
index 1676708cdaad72db345b08a4053cab19720ae33c..1ccc9d4577d772dae95478fe5ee7493dd5b820fa 100755 (executable)
--- a/tests/file_handle.test
+++ b/tests/file_handle.test
@@ -3,10 +3,4 @@
 # Check name_to_handle_at and open_by_handle_at syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -ename_to_handle_at,open_by_handle_at $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -e trace=name_to_handle_at,open_by_handle_at

diff --git a/tests/flock.test b/tests/flock.test
index 3a5be2f9b0c77d40aa05c019b85f9a52470f4cd3..24fcd74cd48b6f152e744b0cca94050617176a0a 100755 (executable)
--- a/tests/flock.test
+++ b/tests/flock.test
@@ -3,8 +3,4 @@
 # Check flock syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -eflock -a19 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a19

diff --git a/tests/fork-f.test b/tests/fork-f.test
index 2d8ae4c68db59a3c301975a3550ae70727059561..d8ca1e3ba19771ec530c32f1b87afe253a1a682c 100755 (executable)
--- a/tests/fork-f.test
+++ b/tests/fork-f.test
@@ -3,10 +3,4 @@
 # Check how strace -f follows fork syscall.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a26 -qq -f -echdir -esignal=none $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a26 -qq -f -e trace=chdir -e signal=none

diff --git a/tests/ftruncate.test b/tests/ftruncate.test
index 31cdf29c69882f24417b4b92c3ea10033a9e3f32..ec8a1e05d1a4e798e4d7a2cd83c2e088ad288797 100755 (executable)
--- a/tests/ftruncate.test
+++ b/tests/ftruncate.test
@@ -3,10 +3,4 @@
 # Check ftruncate syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a24 -eftruncate $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a24

diff --git a/tests/ftruncate64.test b/tests/ftruncate64.test
index abc7f02cdb9942c11d97dc45a104f0d054f30362..90682102954fa308ff8f9b503cd0db60fd48fae4 100755 (executable)
--- a/tests/ftruncate64.test
+++ b/tests/ftruncate64.test
@@ -3,10 +3,4 @@
 # Check ftruncate64 syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a36 -eftruncate64 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a36

diff --git a/tests/getcwd.test b/tests/getcwd.test
index 199765ec9353e496dffad9427b0af23787b5ff77..405187e5cc435fa03537b60c1cbf1f9ec530e589 100755 (executable)
--- a/tests/getcwd.test
+++ b/tests/getcwd.test
@@ -3,8 +3,4 @@
 # Check getcwd syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -egetcwd -a18 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a18

diff --git a/tests/getdents.test b/tests/getdents.test
index a8fb2046a29f2297bf42b3960e0d3585bf019c85..23c4ac3ad596784f01f23a7e456e2efe2641d423 100755 (executable)
--- a/tests/getdents.test
+++ b/tests/getdents.test
@@ -5,9 +5,4 @@
 . "${srcdir=.}/init.sh"
 
 rm -rf -- "$LOG".dir
-run_prog > /dev/null
-run_strace -a22 -vegetdents $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a22 -v

diff --git a/tests/getdents64.test b/tests/getdents64.test
index 7e241c2225de1f6b05d900f7305b9517e0d1d0b0..401cfc7cf2d4a5a58c9cf6391e6f6b5e2097463e 100755 (executable)
--- a/tests/getdents64.test
+++ b/tests/getdents64.test
@@ -5,9 +5,4 @@
 . "${srcdir=.}/init.sh"
 
 rm -rf -- "$LOG".dir
-run_prog > /dev/null
-run_strace -a24 -vegetdents64 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a24 -v

diff --git a/tests/getrandom.test b/tests/getrandom.test
index e47da9cd19f8144f1c1dd2d0078dca8409ccb84b..e06367c9366b4793eb28a26b4baf8ec5f27aa4b3 100755 (executable)
--- a/tests/getrandom.test
+++ b/tests/getrandom.test
@@ -3,10 +3,4 @@
 # Check getrandom syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -e getrandom -xx -s3 -a32 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a32 -xx -s3

diff --git a/tests/getrusage.test b/tests/getrusage.test
index 97b86e1e61392cda8a885c4cb3012e42556947c2..4a3e8ed096612f2b092b9f9a08e11f3a6fea4f09 100755 (executable)
--- a/tests/getrusage.test
+++ b/tests/getrusage.test
@@ -3,8 +3,4 @@
 # Check getrusage syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -v -egetrusage $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -v

diff --git a/tests/getxxid.test b/tests/getxxid.test
index 075cb298692c0e9d055e57c18f17527246fd0b06..9b89d7cfac3f3ccb88359feff7cdbcf5dd50b8b4 100755 (executable)
--- a/tests/getxxid.test
+++ b/tests/getxxid.test
@@ -3,10 +3,4 @@
 # Check getxpid, getxuid, and getxgid syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a10 -egetxpid,getxuid,getxgid $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a10 -e trace=getxpid,getxuid,getxgid

diff --git a/tests/inet-cmsg.test b/tests/inet-cmsg.test
index 307679570b1341c1ce9337dd446db16f47117e58..52ff5f595e0b11120d294dcc75918e90c9ab681d 100755 (executable)
--- a/tests/inet-cmsg.test
+++ b/tests/inet-cmsg.test
@@ -3,10 +3,4 @@
 # Check IPPROTO_IP control messages decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -erecvmsg $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -e trace=recvmsg

diff --git a/tests/init.sh b/tests/init.sh
index e69a4bdf21565974aff8d17d32d3886116747091..b6fa522f292bd39a8014fee3bf93eca991844df0 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -201,6 +201,18 @@ match_grep()
        }
 }
 
+# Usage: run_strace_match_diff [args to run_strace]
+run_strace_match_diff()
+{
+       args="$*"
+       [ -n "$args" -a -z "${args##*-e trace=*}" ] ||
+               set -- -e trace="$NAME" "$@"
+       run_prog > /dev/null
+       run_strace "$@" $args > "$EXP"
+       match_diff "$LOG" "$EXP"
+       rm -f "$EXP"
+}
+
 check_prog cat
 check_prog rm
 

diff --git a/tests/membarrier.test b/tests/membarrier.test
index 473fe056653cb45c325c303df4c60b856d2e7c3f..ad1f713b663daa83206dcc51db0b554bcc0e45bd 100755 (executable)
--- a/tests/membarrier.test
+++ b/tests/membarrier.test
@@ -3,10 +3,4 @@
 # Check membarrier syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a36 -emembarrier $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a36

diff --git a/tests/mincore.test b/tests/mincore.test
index 420f6535723d751194fe92ca9e2b96a4dab66bf0..6af9f492f2a7374de07c362c2ca9db962ac8b039 100755 (executable)
--- a/tests/mincore.test
+++ b/tests/mincore.test
@@ -3,8 +3,4 @@
 # Check mincore syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a22 -emincore $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a22

diff --git a/tests/mknod.test b/tests/mknod.test
index 848ff77ed0312e7e1001c90fed87aab6d16941a1..092d770a99bb21e1bd20b16dde898a2597b3bda5 100755 (executable)
--- a/tests/mknod.test
+++ b/tests/mknod.test
@@ -3,8 +3,4 @@
 # Check mknod syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -emknod -a29 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a29

diff --git a/tests/mlock2.test b/tests/mlock2.test
index bd0c7d2c3f58950fe5ae6542de3ee88bbaa437ee..bc412e97df90ff4237b84f414e0f554d69006e6c 100755 (executable)
--- a/tests/mlock2.test
+++ b/tests/mlock2.test
@@ -3,10 +3,4 @@
 # Check mlock2 syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -e mlock2 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff

diff --git a/tests/mmsg.test b/tests/mmsg.test
index 23b92411adf55bc4e5e51d1b23895bde76b32718..a8148ba88a1eca6bb578b807bacb78c60fd24ca1 100755 (executable)
--- a/tests/mmsg.test
+++ b/tests/mmsg.test
@@ -3,10 +3,4 @@
 # Check how iovecs in struct mmsghdr are decoded.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -e trace=recvmmsg,sendmmsg -e read=0 -e write=1 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -e trace=recvmmsg,sendmmsg -e read=0 -e write=1

diff --git a/tests/nanosleep.test b/tests/nanosleep.test
index 7fa16325c8d093bc1be650cde7a2e368e2d1c441..055a8dcd795da868e871fe87287c8de619032a34 100755 (executable)
--- a/tests/nanosleep.test
+++ b/tests/nanosleep.test
@@ -1,13 +1,6 @@
 #!/bin/sh
 
-# Check nanosleep syscall decoding.
+# Check nanosleep and setitimer syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscalls=nanosleep,setitimer
-run_strace -a20 -e trace=$syscalls $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a20 -e trace=nanosleep,setitimer

diff --git a/tests/open.test b/tests/open.test
index ac891e3abcb11acb7e9b115eccb40ffae1db6eb5..6df19cb82003638824d477e18562ed7af425ae67 100755 (executable)
--- a/tests/open.test
+++ b/tests/open.test
@@ -3,10 +3,4 @@
 # Check open syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscall=$NAME
-sample=$syscall.sample
-run_strace -a30 -e$syscall -P$sample $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a30 -P $NAME.sample

diff --git a/tests/openat.test b/tests/openat.test
index 49ae4d1365df75673c7208985e0775e2b459a627..68c4cee149512d90445cf0bea83be6fbbb151399 100755 (executable)
--- a/tests/openat.test
+++ b/tests/openat.test
@@ -3,10 +3,4 @@
 # Check openat syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscall=$NAME
-sample=$syscall.sample
-run_strace -e$syscall -P$sample $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -P $NAME.sample

diff --git a/tests/pselect6.test b/tests/pselect6.test
index 4383fa54b55ff67480274df9595f2c74a9d93485..203f8e249f3a2bbd8fa8b465b56f16c3ae029a87 100755 (executable)
--- a/tests/pselect6.test
+++ b/tests/pselect6.test
@@ -3,11 +3,4 @@
 # Check pselect6 syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -e pselect6 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff

diff --git a/tests/readdir.test b/tests/readdir.test
index 775e98e6e1149644ead71de5c6a094323641e8d6..e3132737fba1dcb441c29549aba57e8d035d5ac8 100755 (executable)
--- a/tests/readdir.test
+++ b/tests/readdir.test
@@ -5,9 +5,4 @@
 . "${srcdir=.}/init.sh"
 
 rm -rf -- "$LOG".dir
-run_prog > /dev/null
-run_strace -a16 -ereaddir $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a16

diff --git a/tests/readlink.test b/tests/readlink.test
index 6e821150502c1bae7d48c66f6dab897a9fa24b3e..c026ecbed755030880f2d3948cb4818a52a79ecb 100755 (executable)
--- a/tests/readlink.test
+++ b/tests/readlink.test
@@ -3,10 +3,4 @@
 # Check readlink syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-syscall=$NAME
-run_prog > /dev/null
-run_strace -xx -e $syscall $args > "$OUT"
-match_diff "$LOG" "$OUT"
-
-rm -f -- "$OUT"
+run_strace_match_diff -xx

diff --git a/tests/readv.test b/tests/readv.test
index d4796514407fbab68115c84b22a7ea6efb183e37..cbcffde99c03ae4182db4482816ef8eb0ca0b3f7 100755 (executable)
--- a/tests/readv.test
+++ b/tests/readv.test
@@ -3,10 +3,4 @@
 # Check decoding of readv and writev syscalls.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a16 -eread=0 -ewrite=1 -ereadv,writev $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a16 -eread=0 -ewrite=1 -e trace=readv,writev

diff --git a/tests/recvmsg.test b/tests/recvmsg.test
index b8a000ac2a707f97fe0cbf694f5f85171db6e1d2..e373a20a6e1e834417a01181b7d477b018ded137 100755 (executable)
--- a/tests/recvmsg.test
+++ b/tests/recvmsg.test
@@ -3,10 +3,4 @@
 # Check decoding of recvmsg and sendmsg syscalls.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -eread=0 -ewrite=1 -erecvmsg,sendmsg $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -eread=0 -ewrite=1 -e trace=recvmsg,sendmsg

diff --git a/tests/rename.test b/tests/rename.test
index 9859530da08cc9d67e145829aa9e10fbe702da4c..9067e4ccee960157395b9c4d7c338404ccf6c401 100755 (executable)
--- a/tests/rename.test
+++ b/tests/rename.test
@@ -3,8 +3,4 @@
 # Check rename syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -erename -a35 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a35

diff --git a/tests/renameat.test b/tests/renameat.test
index 871764ca411815a42d88888c0f26dc6149683180..9b0a61dd521b003148724947232a5a7118b2f13d 100755 (executable)
--- a/tests/renameat.test
+++ b/tests/renameat.test
@@ -1,10 +1,6 @@
 #!/bin/sh
 
-# Check rename syscall decoding.
+# Check renameat syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -erenameat $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff

diff --git a/tests/rt_sigpending.test b/tests/rt_sigpending.test
index 8398e78b799396f4e7969a3ea5f60d6c80180d80..40c83a810794ac3f9b97e4bebef943276463b8c6 100755 (executable)
--- a/tests/rt_sigpending.test
+++ b/tests/rt_sigpending.test
@@ -3,8 +3,4 @@
 # Check rt_sigpending syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a20 -ert_sigpending $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a20

diff --git a/tests/rt_sigprocmask.test b/tests/rt_sigprocmask.test
index f2c5015a56ebb8d8c1bf2c52d0e0a00e9aca09f0..1e60ebde5f759b5d9ab29748f1f5ca3255a0fa96 100755 (executable)
--- a/tests/rt_sigprocmask.test
+++ b/tests/rt_sigprocmask.test
@@ -3,8 +3,4 @@
 # Check rt_sigprocmask syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -ert_sigprocmask $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff

diff --git a/tests/rt_sigqueueinfo.test b/tests/rt_sigqueueinfo.test
index f7dfbcd5eafc8b0b64a0a80b6216e3c8b14ab95d..c03c76f2a8a3e451604ecb3bcea7bb7251dcea60 100755 (executable)
--- a/tests/rt_sigqueueinfo.test
+++ b/tests/rt_sigqueueinfo.test
@@ -3,10 +3,4 @@
 # Check decoding of rt_sigqueueinfo syscall
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -ert_sigqueueinfo -esignal=none $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -esignal=none

diff --git a/tests/rt_sigsuspend.test b/tests/rt_sigsuspend.test
index 76e69ff38ca8997ee5099235d2a396dec1044965..2e30fd4b1fba0a30a31be4b413537c7b1817ad4a 100755 (executable)
--- a/tests/rt_sigsuspend.test
+++ b/tests/rt_sigsuspend.test
@@ -3,8 +3,4 @@
 # Check rt_sigsuspend syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a20 -ert_sigsuspend -esignal=none $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a20 -esignal=none

diff --git a/tests/rt_sigtimedwait.test b/tests/rt_sigtimedwait.test
index e02e6266f40e3e8d5d7c5650df5d13ef03a34471..e15fb7796f1ae40c29ac4fe8b64bc847e91d889e 100755 (executable)
--- a/tests/rt_sigtimedwait.test
+++ b/tests/rt_sigtimedwait.test
@@ -3,8 +3,4 @@
 # Check rt_sigtimedwait syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a38 -ert_sigtimedwait $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a38

diff --git a/tests/rt_tgsigqueueinfo.test b/tests/rt_tgsigqueueinfo.test
index 2662df9de7eefb668db792f1465a48470b276c29..ab24e2d6302f68b6e714a92ec8372426f630e1b1 100755 (executable)
--- a/tests/rt_tgsigqueueinfo.test
+++ b/tests/rt_tgsigqueueinfo.test
@@ -3,8 +3,4 @@
 # Check decoding of rt_tgsigqueueinfo syscall
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -ert_tgsigqueueinfo -esignal=none $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -esignal=none

diff --git a/tests/sched_get_priority_mxx.test b/tests/sched_get_priority_mxx.test
index 36838bd522279541472ac5badc4ecedcc91ce366..0d1a1a78a9d2d208a14c698d2f3f3a2acc3985a1 100755 (executable)
--- a/tests/sched_get_priority_mxx.test
+++ b/tests/sched_get_priority_mxx.test
@@ -3,8 +3,4 @@
 # Check sched_get_priority_min and sched_get_priority_max syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -esched_get_priority_min,sched_get_priority_max -a33 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a33 -e trace=sched_get_priority_min,sched_get_priority_max

diff --git a/tests/sched_xetaffinity.test b/tests/sched_xetaffinity.test
index 4160e5d3ad8bda5e4e62c33f061e3c10ab537efb..246ea21aa0efa73c196ece09efea6858bbf5b9e5 100755 (executable)
--- a/tests/sched_xetaffinity.test
+++ b/tests/sched_xetaffinity.test
@@ -3,10 +3,4 @@
 # Check sched_getaffinity and sched_setaffinity syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a28 -esched_getaffinity,sched_setaffinity $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a28 -e trace=sched_getaffinity,sched_setaffinity

diff --git a/tests/sched_xetparam.test b/tests/sched_xetparam.test
index 7283df51c5a1aeda7a13e48aa6706e69682ebd1b..c9fede139e7c307a1a5a93ffd48b5e76d5979ddf 100755 (executable)
--- a/tests/sched_xetparam.test
+++ b/tests/sched_xetparam.test
@@ -3,8 +3,4 @@
 # Check sched_getparam and sched_setparam syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -esched_getparam,sched_setparam -a23 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a23 -e trace=sched_getparam,sched_setparam

diff --git a/tests/sched_xetscheduler.test b/tests/sched_xetscheduler.test
index 87a6998d646e25f89c61ae691e45de357b45a8da..07c93f3118fcf6d742562c280e796016f57e1c1b 100755 (executable)
--- a/tests/sched_xetscheduler.test
+++ b/tests/sched_xetscheduler.test
@@ -3,8 +3,4 @@
 # Check sched_getscheduler and sched_setscheduler syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -esched_getscheduler,sched_setscheduler -a22 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a22 -e trace=sched_getscheduler,sched_setscheduler

diff --git a/tests/seccomp.test b/tests/seccomp.test
index cc0da586a403694d9e42cddf431270c5e92220b2..1c9579acd48ab7049f57a2b51128c1ed7b8ab463 100755 (executable)
--- a/tests/seccomp.test
+++ b/tests/seccomp.test
@@ -3,11 +3,4 @@
 # Check how SECCOMP_MODE_FILTER is decoded.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -veprctl $args > "$OUT"
-match_diff "$LOG" "$OUT"
-
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -v -e trace=prctl

diff --git a/tests/select.test b/tests/select.test
index ae6d780feb83690da58996f2fe5ac7a16e855ca9..60b88caf951d87c379b1b4385e8573920147fe1a 100755 (executable)
--- a/tests/select.test
+++ b/tests/select.test
@@ -3,12 +3,4 @@
 # Check select syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscall=$NAME
-run_strace -a36 -e$syscall $args > "$OUT"
-match_diff "$LOG" "$OUT"
-
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a36

diff --git a/tests/sendfile.test b/tests/sendfile.test
index ae7957f32e996b48543c2d5e6aed92519512db64..48dba5856db2a78c471fc3a881916c596a977396 100755 (executable)
--- a/tests/sendfile.test
+++ b/tests/sendfile.test
@@ -3,10 +3,4 @@
 # Check sendfile syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a24 -esendfile $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a27

diff --git a/tests/sendfile64.test b/tests/sendfile64.test
index 980e0f74efa8d8a853b44fcc0b74edc8c8cd2306..faa05254e4f809ae60a6b6cf23257527d54a8a5e 100755 (executable)
--- a/tests/sendfile64.test
+++ b/tests/sendfile64.test
@@ -3,10 +3,4 @@
 # Check sendfile64 syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a24 -esendfile64 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a29

diff --git a/tests/splice.test b/tests/splice.test
index 41c3d8ab0b8a33536976f7dae331a657b5754f00..cc5c327ebf00a82e97f234ab6e6dd3f6b92e22cf 100755 (executable)
--- a/tests/splice.test
+++ b/tests/splice.test
@@ -3,8 +3,4 @@
 # Check splice syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -esplice $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff

diff --git a/tests/statx.sh b/tests/statx.sh
index 6c2d0959a8d84a9801926ef30ffec61335bd7754..830e5fc71941ec6a43a07ad353aa6e36e2c2968d 100755 (executable)
--- a/tests/statx.sh
+++ b/tests/statx.sh
@@ -3,11 +3,4 @@
 # Check decoding of stat family syscalls.
 
 . "${srcdir=.}/init.sh"
-
-syscall=$NAME
-run_prog > /dev/null
-run_strace -ve$syscall -P$syscall.sample $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -v -P $NAME.sample

diff --git a/tests/sysinfo.test b/tests/sysinfo.test
index f14a900f54e8cb7cf99a2a020f4c71eb512bbd9c..806d8b61d9f5458c6549d3d9ce3a8656f2bdf4eb 100755 (executable)
--- a/tests/sysinfo.test
+++ b/tests/sysinfo.test
@@ -3,10 +3,4 @@
 # Check decoding of sysinfo syscall
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a14 -esysinfo $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a14

diff --git a/tests/syslog.test b/tests/syslog.test
index e216a78ffc5c225b4f510f75969fcbdbb6876852..1c2158e4a2b5eb2acc38aa8b7614bb699cc1f583 100755 (executable)
--- a/tests/syslog.test
+++ b/tests/syslog.test
@@ -3,8 +3,4 @@
 # Check syslog syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -esyslog -a36 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a36

diff --git a/tests/tee.test b/tests/tee.test
index 51124524ef6ecb2b5e0ce33e4a50621942dbb00e..76b600036b213f86834920db7ad9a6f8d158cc0c 100755 (executable)
--- a/tests/tee.test
+++ b/tests/tee.test
@@ -3,8 +3,4 @@
 # Check tee syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -etee $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff

diff --git a/tests/time.test b/tests/time.test
index 75d35fbb65acfd3cd7745371806ba1047ace302a..6ab193a4b569dfd3c5732231a57977840029474e 100755 (executable)
--- a/tests/time.test
+++ b/tests/time.test
@@ -3,10 +3,4 @@
 # Check time syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a10 -etime $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a10

diff --git a/tests/timer_create.test b/tests/timer_create.test
index 3dfdbbfd56a9a4625327916bcd7eeee02fb94efa..870a1795c078db6725068ca93a00dbeaf591a224 100755 (executable)
--- a/tests/timer_create.test
+++ b/tests/timer_create.test
@@ -3,10 +3,4 @@
 # Check timer_create syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -e timer_create $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff

diff --git a/tests/timer_xettime.test b/tests/timer_xettime.test
index 5c4caee06293a444df4d788c7e1e586724ca3f81..08bcdd68c9e3b895a62401363883b541616d9488 100755 (executable)
--- a/tests/timer_xettime.test
+++ b/tests/timer_xettime.test
@@ -1,13 +1,6 @@
 #!/bin/sh
 
-# Check timer_settime and timer_gettime syscalls decoding.
+# Check timer_create, timer_settime, and timer_gettime syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscalls=timer_create,timer_settime,timer_gettime
-run_strace -e trace=$syscalls $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -e trace=timer_create,timer_settime,timer_gettime

diff --git a/tests/timerfd_xettime.test b/tests/timerfd_xettime.test
index a1d3b64225190a7c2ecc52c406d4ef998a74ccf7..75aa21c2a97ab8800fe16e25f4816913d6036ca5 100755 (executable)
--- a/tests/timerfd_xettime.test
+++ b/tests/timerfd_xettime.test
@@ -3,11 +3,4 @@
 # Check timerfd_create, timerfd_settime, and timerfd_gettime syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscalls=timerfd_create,timerfd_settime,timerfd_gettime
-run_strace -e trace=$syscalls $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -e trace=timerfd_create,timerfd_settime,timerfd_gettime

diff --git a/tests/times-fail.test b/tests/times-fail.test
index 92b4c79a3292828a32c7f99de716456ac6666377..ee28a060b8ba30be8bb13487291598c990ef0fe9 100755 (executable)
--- a/tests/times-fail.test
+++ b/tests/times-fail.test
@@ -3,10 +3,4 @@
 # Check decoding of failing times syscall
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a12 -etimes $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a12 -e trace=times

diff --git a/tests/times.test b/tests/times.test
index 9be10593ffa4c6c1fe21b39f3180dd29ba748a4a..b97e0d33907cabdfad719f01f44d6b12936fc57c 100755 (executable)
--- a/tests/times.test
+++ b/tests/times.test
@@ -3,10 +3,4 @@
 # Check decoding of times syscall
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -etimes -esignal=none $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -esignal=none

diff --git a/tests/truncate.test b/tests/truncate.test
index 0cb65f88943a432284a4834f40cd79dff8dd4c80..6bf1e70254161b5648c688e991a1f52613c3d29b 100755 (executable)
--- a/tests/truncate.test
+++ b/tests/truncate.test
@@ -3,10 +3,4 @@
 # Check truncate syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -etruncate $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff

diff --git a/tests/truncate64.test b/tests/truncate64.test
index bb1f44e05949ea54ff4b0f7b0a30d301fa9cc853..c466806263b45674a33fe0de4abbc12a07521ebe 100755 (executable)
--- a/tests/truncate64.test
+++ b/tests/truncate64.test
@@ -3,10 +3,4 @@
 # Check truncate64 syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -etruncate64 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff

diff --git a/tests/umask.test b/tests/umask.test
index 816d5fec9a49d0c3ff1fe77badb625125951331b..1351721f62da389d08da039d1c2c5a31b76694f8 100755 (executable)
--- a/tests/umask.test
+++ b/tests/umask.test
@@ -3,8 +3,4 @@
 # Check umask syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -eumask -a11 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a11

diff --git a/tests/umount.test b/tests/umount.test
index e1cd6309311d4fc9179070c616d0251965d7d49c..a5840d54b67bfff7db6452d107c24b2c61cccbf7 100755 (executable)
--- a/tests/umount.test
+++ b/tests/umount.test
@@ -4,13 +4,8 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog > /dev/null
 case "$STRACE_ARCH" in
        alpha) syscall=oldumount ;;
        *) syscall=umount ;;
 esac
-run_strace -a24 -s6 -e$syscall $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a24 -s6 -e trace=$syscall

diff --git a/tests/umount2.test b/tests/umount2.test
index 8893a28da094b90bdadbaa8f359109d7ac56f2c7..c43b38dbaa797126a5358c59e6cd58a006b6c62c 100755 (executable)
--- a/tests/umount2.test
+++ b/tests/umount2.test
@@ -4,13 +4,8 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog > /dev/null
 case "$STRACE_ARCH" in
        alpha|ia64) syscall=umount ;;
        *) syscall=umount2 ;;
 esac
-run_strace -s7 -e$syscall $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -s7 -e trace=$syscall

diff --git a/tests/userfaultfd.test b/tests/userfaultfd.test
index 4cd523f66be9b875360cb1ab899e2985a7f87f7a..af8b6fbe892784397c361fbcfb486e079af1b178 100755 (executable)
--- a/tests/userfaultfd.test
+++ b/tests/userfaultfd.test
@@ -3,10 +3,4 @@
 # Check userfaultfd syscall decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a38 -euserfaultfd $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a38

diff --git a/tests/vmsplice.test b/tests/vmsplice.test
index 6a85abdc78e5adb08f215b1398871de449912e7d..8a80650e0c85b335551084f9221ef04e8b8e6df8 100755 (executable)
--- a/tests/vmsplice.test
+++ b/tests/vmsplice.test
@@ -3,8 +3,4 @@
 # Check decoding of vmsplice syscall.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -ewrite=1 -evmsplice $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -ewrite=1

diff --git a/tests/xet_robust_list.test b/tests/xet_robust_list.test
index 46231ebde3eb29d2eccba3eb60f390147051f667..8a3a3820b532609bcf149480841afa959929efbd 100755 (executable)
--- a/tests/xet_robust_list.test
+++ b/tests/xet_robust_list.test
@@ -3,10 +3,4 @@
 # Check get_robust_list and set_robust_list syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a24 -eget_robust_list,set_robust_list $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a24 -e trace=get_robust_list,set_robust_list

diff --git a/tests/xetitimer.test b/tests/xetitimer.test
index ecd31b419ccddcb7ed9e0d8116feb842312ac1e9..4aa00cceef0ff95b9d8846d1077fd357e4bbbed0 100755 (executable)
--- a/tests/xetitimer.test
+++ b/tests/xetitimer.test
@@ -3,11 +3,4 @@
 # Check setitimer and getitimer syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscalls=setitimer,getitimer
-run_strace -e trace=$syscalls $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -e trace=setitimer,getitimer

diff --git a/tests/xetpgid.test b/tests/xetpgid.test
index 71817a2027f59ee6b4a626b1cb8a472c091b280b..07f4f9e80f81754cc5c53930062827e15b798d57 100755 (executable)
--- a/tests/xetpgid.test
+++ b/tests/xetpgid.test
@@ -3,8 +3,4 @@
 # Check getpgid and setpgid syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -a11 -egetpgid,setpgid $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a11 -e trace=getpgid,setpgid

diff --git a/tests/xetpriority.test b/tests/xetpriority.test
index 58e52032118f3cbb50608417c048ccb182e1a8b8..2c84ba418f42d0cf69edf6518433230e92ab0635 100755 (executable)
--- a/tests/xetpriority.test
+++ b/tests/xetpriority.test
@@ -3,8 +3,4 @@
 # Check getpriority and setpriority syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-run_strace -egetpriority,setpriority -a29 $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
+run_strace_match_diff -a29 -e trace=getpriority,setpriority

diff --git a/tests/xettimeofday.test b/tests/xettimeofday.test
index 88bf0ec266c042b23070a8863cd69ea5b894b732..68764e46808a9270a7f2bf0737aef1ff5180f685 100755 (executable)
--- a/tests/xettimeofday.test
+++ b/tests/xettimeofday.test
@@ -3,11 +3,4 @@
 # Check gettimeofday and settimeofday syscalls decoding.
 
 . "${srcdir=.}/init.sh"
-
-run_prog > /dev/null
-syscalls=gettimeofday,settimeofday
-run_strace -a20 -e trace=$syscalls $args > "$OUT"
-match_diff "$LOG" "$OUT"
-rm -f "$OUT"
-
-exit 0
+run_strace_match_diff -a20 -e trace=gettimeofday,settimeofday