From: Dmitry V. Levin Date: Wed, 30 Mar 2016 00:16:24 +0000 (+0000) Subject: tests: factor out a part common to many simply organized test scripts X-Git-Tag: v4.12~474 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dde5671bded4f16c74e6a17b7a3c546139fae0b;p=strace 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 4abd8bc6..e68a6ca1 100755 --- 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 8b73395a..2ba90da8 100755 --- 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 621122f6..267b2239 100755 --- 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 c14bcf63..70e561a1 100755 --- 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 1eafd4f0..ec434a60 100755 --- 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 34569ccf..f045a66e 100755 --- 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 f431927b..c39f6acd 100755 --- 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 54beff7a..49fddd21 100755 --- 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 839906d8..1dc19198 100755 --- 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 d90eb6db..509c5db1 100755 --- 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 d4f17dff..293f78f9 100755 --- 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 052c20d9..7a926a97 100755 --- 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 f7f0ce09..a9052248 100755 --- 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 50a0bae8..879e03e2 100755 --- 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 e8fe393e..32ad456c 100755 --- 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 cbe8ef6a..9aea122d 100755 --- 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 1676708c..1ccc9d45 100755 --- 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 3a5be2f9..24fcd74c 100755 --- 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 2d8ae4c6..d8ca1e3b 100755 --- 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 31cdf29c..ec8a1e05 100755 --- 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 abc7f02c..90682102 100755 --- 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 199765ec..405187e5 100755 --- 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 a8fb2046..23c4ac3a 100755 --- 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 7e241c22..401cfc7c 100755 --- 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 e47da9cd..e06367c9 100755 --- 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 97b86e1e..4a3e8ed0 100755 --- 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 075cb298..9b89d7cf 100755 --- 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 30767957..52ff5f59 100755 --- 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 e69a4bdf..b6fa522f 100644 --- 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 473fe056..ad1f713b 100755 --- 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 420f6535..6af9f492 100755 --- 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 848ff77e..092d770a 100755 --- 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 bd0c7d2c..bc412e97 100755 --- 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 23b92411..a8148ba8 100755 --- 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 7fa16325..055a8dcd 100755 --- 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 ac891e3a..6df19cb8 100755 --- 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 49ae4d13..68c4cee1 100755 --- 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 4383fa54..203f8e24 100755 --- 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 775e98e6..e3132737 100755 --- 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 6e821150..c026ecbe 100755 --- 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 d4796514..cbcffde9 100755 --- 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 b8a000ac..e373a20a 100755 --- 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 9859530d..9067e4cc 100755 --- 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 871764ca..9b0a61dd 100755 --- 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 8398e78b..40c83a81 100755 --- 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 f2c5015a..1e60ebde 100755 --- 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 f7dfbcd5..c03c76f2 100755 --- 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 76e69ff3..2e30fd4b 100755 --- 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 e02e6266..e15fb779 100755 --- 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 2662df9d..ab24e2d6 100755 --- 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 36838bd5..0d1a1a78 100755 --- 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 4160e5d3..246ea21a 100755 --- 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 7283df51..c9fede13 100755 --- 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 87a6998d..07c93f31 100755 --- 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 cc0da586..1c9579ac 100755 --- 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 ae6d780f..60b88caf 100755 --- 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 ae7957f3..48dba585 100755 --- 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 980e0f74..faa05254 100755 --- 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 41c3d8ab..cc5c327e 100755 --- 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 6c2d0959..830e5fc7 100755 --- 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 f14a900f..806d8b61 100755 --- 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 e216a78f..1c2158e4 100755 --- 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 51124524..76b60003 100755 --- 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 75d35fbb..6ab193a4 100755 --- 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 3dfdbbfd..870a1795 100755 --- 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 5c4caee0..08bcdd68 100755 --- 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 a1d3b642..75aa21c2 100755 --- 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 92b4c79a..ee28a060 100755 --- 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 9be10593..b97e0d33 100755 --- 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 0cb65f88..6bf1e702 100755 --- 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 bb1f44e0..c4668062 100755 --- 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 816d5fec..1351721f 100755 --- 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 e1cd6309..a5840d54 100755 --- 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 8893a28d..c43b38db 100755 --- 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 4cd523f6..af8b6fbe 100755 --- 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 6a85abdc..8a80650e 100755 --- 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 46231ebd..8a3a3820 100755 --- 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 ecd31b41..4aa00cce 100755 --- 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 71817a20..07f4f9e8 100755 --- 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 58e52032..2c84ba41 100755 --- 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 88bf0ec2..68764e46 100755 --- 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