tests: move definitions of $OUT and $ERR to init.sh

As virtually every test defines either one or both of OUT and ERR
variables and these definitions are exactly the same, move definitions
of these variables from individual tests to init.sh.

* tests/init.sh (OUT, ERR): New variables.
* tests/ipc.sh: Remove initialization of OUT variable.
* tests/statx.sh: Likewise.
* tests/*.test: Remove initialization of OUT and ERR variables.

diff --git a/tests/acct.test b/tests/acct.test
index d258389016df600ea662dfba7d4f4a44f818d2d7..4abd8bc6bbf1d0288d6bbf3b6a976d088fcdeabe 100755 (executable)
--- a/tests/acct.test
+++ b/tests/acct.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -eacct -a21 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/adjtimex.test b/tests/adjtimex.test
index a2466e64a65f34a0ee63e8e24b93753cded300a8..01405501117bf7ad03554a7a7235d43464f5eb20 100755 (executable)
--- a/tests/adjtimex.test
+++ b/tests/adjtimex.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a 15 -e adjtimex $args > "$OUT"
 match_grep "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/aio.test b/tests/aio.test
index 93428f3f65152a483f2e2fb73967177be798eb24..8b73395a4ca9235fef3e52de388790694aaa8e69 100755 (executable)
--- a/tests/aio.test
+++ b/tests/aio.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=io_setup,io_submit,io_getevents,io_cancel,io_destroy
 run_strace -a14 -e trace=$syscalls $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/alarm.test b/tests/alarm.test
index 6248c5afe7d6939ca29c49ca6ffa9916985807e1..621122f68090c5732d6e8783c434958f9192b101 100755 (executable)
--- a/tests/alarm.test
+++ b/tests/alarm.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a10 -ealarm $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/attach-f-p.test b/tests/attach-f-p.test
index ecae25fccb6683271ef637a8addd5bf5570a60d1..02230a07c7b6e3e739ae7e726eacd38543c8ab43 100755 (executable)
--- a/tests/attach-f-p.test
+++ b/tests/attach-f-p.test
@@ -36,8 +36,6 @@ run_prog_skip_if_failed \
        kill -0 $$
 run_prog ./attach-f-p > /dev/null 3>&1
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
 ./set_ptracer_any sh -c "exec ./attach-f-p > $EXP 3> $OUT" > /dev/null &
 tracee_pid=$!
 

diff --git a/tests/attach-p-cmd.test b/tests/attach-p-cmd.test
index de3f4cd84dcc6fe91af7639a4eefb9eca5456d52..f8c1d1cdfe847ab3ebcf21468903c22e427f2fef 100755 (executable)
--- a/tests/attach-p-cmd.test
+++ b/tests/attach-p-cmd.test
@@ -34,7 +34,6 @@ run_prog_skip_if_failed \
 run_prog ./attach-p-cmd-cmd > /dev/null
 run_prog ./attach-p-cmd-p 1 > /dev/null
 
-OUT="$LOG.out"
 ./set_ptracer_any ./attach-p-cmd-p 1 > "$OUT" &
 tracee_pid=$!
 

diff --git a/tests/bpf.test b/tests/bpf.test
index 8725468694ab0f6c6e8f48a6e32bfbdc9459a923..6c77ae113e4fb0592fa154b69011f2939f11c8aa 100755 (executable)
--- a/tests/bpf.test
+++ b/tests/bpf.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -ebpf $args > "$OUT"
 match_grep "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/chmod.test b/tests/chmod.test
index 77ec2f14cf0b622070a54b65352e0dc675d2875f..c14bcf637e6bd6d50bdbdbfab67d47502ee7c521 100755 (executable)
--- a/tests/chmod.test
+++ b/tests/chmod.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a28 -echmod $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/clock_nanosleep.test b/tests/clock_nanosleep.test
index 8b58664f4a610beec6462c1ccb34961ce18da699..1eafd4f04fdb3d1360f10c41922486e8b195e157 100755 (executable)
--- a/tests/clock_nanosleep.test
+++ b/tests/clock_nanosleep.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=clock_nanosleep,clock_gettime,setitimer
 run_strace -e trace=$syscalls $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/clock_xettime.test b/tests/clock_xettime.test
index 544715bf91c813507bfcde291ab044f2f8e2c16f..34569ccfdbeb70267a8791a84f001aca4297a608 100755 (executable)
--- a/tests/clock_xettime.test
+++ b/tests/clock_xettime.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=clock_getres,clock_gettime,clock_settime
 run_strace -a36 -e trace=$syscalls $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/copy_file_range.test b/tests/copy_file_range.test
index 95c34dbfeb41566cf5b7da6d57a09d5c22961c51..f431927be27d73ff526407c15dfeb0646838daf5 100755 (executable)
--- a/tests/copy_file_range.test
+++ b/tests/copy_file_range.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -ecopy_file_range $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/creat.test b/tests/creat.test
index a692e1919c92089238f767f1e80b633015f8ed42..54beff7a2585e83220f1869307f9db05acb7837c 100755 (executable)
--- a/tests/creat.test
+++ b/tests/creat.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -ecreat -a21 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/dup.test b/tests/dup.test
index f33dd978c132dbfbd601e1baf21bfbe6b38de47a..839906d8d702779390e757ddab27834f89b92adc 100755 (executable)
--- a/tests/dup.test
+++ b/tests/dup.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -edup -a8 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/dup2.test b/tests/dup2.test
index d2e6bc7d60bb30b13e5f52bd7e3c81140db840b8..d90eb6db1a32879c4eb25cb77dcea5e9191afa14 100755 (executable)
--- a/tests/dup2.test
+++ b/tests/dup2.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -edup2 -a13 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/dup3.test b/tests/dup3.test
index 61fc16e19ed821ebfccc81ab3c03b390909e75b3..d4f17dff43682a3a9aca8a1a0b78aa8dd1e8aa33 100755 (executable)
--- a/tests/dup3.test
+++ b/tests/dup3.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -edup3 -a24 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/epoll_create1.test b/tests/epoll_create1.test
index 71ac29aa2aa63754303d03dc62c7279f61feee5a..052c20d9685c70e1a6e0e297f7afb758583dc268 100755 (executable)
--- a/tests/epoll_create1.test
+++ b/tests/epoll_create1.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a28 -eepoll_create1 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/execve-v.test b/tests/execve-v.test
index 599a80cbe4ca3accd203630135cf2f83f73984e3..cce586014d753349f599baeb0a7808bead28d22d 100755 (executable)
--- a/tests/execve-v.test
+++ b/tests/execve-v.test
@@ -6,9 +6,6 @@
 
 check_prog grep
 run_prog > /dev/null
-
-OUT="$LOG.out"
-EXP="$LOG.exp"
 run_strace -veexecve $args > "$EXP"
 
 # Filter out execve() call made by strace.

diff --git a/tests/execve.test b/tests/execve.test
index 14cae625f44dd23ea588d906202343f2b06b7cf5..263b6fc5badc3e4b3522eff49771649d3dc3b1a1 100755 (executable)
--- a/tests/execve.test
+++ b/tests/execve.test
@@ -6,9 +6,6 @@
 
 check_prog grep
 run_prog > /dev/null
-
-OUT="$LOG.out"
-EXP="$LOG.exp"
 run_strace -eexecve $args > "$EXP"
 
 # Filter out execve() call made by strace.

diff --git a/tests/execveat-v.test b/tests/execveat-v.test
index 776d2904a47ea8361b5f8d3874be76a5fdfba6b8..f7f0ce09c25f4e24d0d338a049e24d88d6dd87c4 100755 (executable)
--- a/tests/execveat-v.test
+++ b/tests/execveat-v.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -veexecveat $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/execveat.test b/tests/execveat.test
index eb4a47aa4acbbb1a20dbdcb46fe578c827bac1fd..50a0bae8bcccd0ef98e72ffe305f07da4d01f362 100755 (executable)
--- a/tests/execveat.test
+++ b/tests/execveat.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -eexecveat $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/fchmod.test b/tests/fchmod.test
index 931d7278608e8cfbfe602e625523c7197fe989f9..e8fe393ed5c6ad50317c44ad0f597e7f23a9054b 100755 (executable)
--- a/tests/fchmod.test
+++ b/tests/fchmod.test
@@ -3,7 +3,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a16 -efchmod $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/fcntl.test b/tests/fcntl.test
index 4bb95fb323f4300522ad79b7277a8223506a3bd8..d4871b6f121c3a7b1e42d0966aafe3c273012443 100755 (executable)
--- a/tests/fcntl.test
+++ b/tests/fcntl.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscall=${ME_%.test}
 run_strace -a8 -e$syscall $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/file_handle.test b/tests/file_handle.test
index b3060104add04c221181515e1efcb84ba28bc660..1676708cdaad72db345b08a4053cab19720ae33c 100755 (executable)
--- a/tests/file_handle.test
+++ b/tests/file_handle.test
@@ -5,10 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-
-OUT="$LOG.out"
 run_strace -ename_to_handle_at,open_by_handle_at $args > "$OUT"
-
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"
 

diff --git a/tests/flock.test b/tests/flock.test
index 771af7d0d2d3abb0093795a26749806b05aed5b1..3a5be2f9b0c77d40aa05c019b85f9a52470f4cd3 100755 (executable)
--- a/tests/flock.test
+++ b/tests/flock.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -eflock -a19 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/fork-f.test b/tests/fork-f.test
index 07de2b0815f3d6b725d7f1c686fa3b4ff8422f97..2d8ae4c68db59a3c301975a3550ae70727059561 100755 (executable)
--- a/tests/fork-f.test
+++ b/tests/fork-f.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a26 -qq -f -echdir -esignal=none $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/fstat.test b/tests/fstat.test
index 696151bc3807613c84357848b5adbbc407bd1883..9c65019998c42748ef232faed37858adf0051f0e 100755 (executable)
--- a/tests/fstat.test
+++ b/tests/fstat.test
@@ -10,7 +10,6 @@
 
 syscall=${ME_%.test}
 run_prog > /dev/null
-OUT="$LOG.out"
 sample=$syscall.sample
 > "$sample"
 run_strace -ve$syscall -P$sample $args > "$OUT"

diff --git a/tests/ftruncate.test b/tests/ftruncate.test
index 9b65d7109deef34877523102a148e319ebb82d4a..31cdf29c69882f24417b4b92c3ea10033a9e3f32 100755 (executable)
--- a/tests/ftruncate.test
+++ b/tests/ftruncate.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a24 -eftruncate $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/ftruncate64.test b/tests/ftruncate64.test
index 43cd9adddb4ff6e4cb8dc65f0bf35058ac906b9e..abc7f02cdb9942c11d97dc45a104f0d054f30362 100755 (executable)
--- a/tests/ftruncate64.test
+++ b/tests/ftruncate64.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a36 -eftruncate64 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/getcwd.test b/tests/getcwd.test
index 12f77edcdda6251ff3ff474649edbf3e6a775ada..199765ec9353e496dffad9427b0af23787b5ff77 100755 (executable)
--- a/tests/getcwd.test
+++ b/tests/getcwd.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -egetcwd -a18 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/getdents.test b/tests/getdents.test
index 0b39b8476df18a967fd4db9857cf053b573571e1..a8fb2046a29f2297bf42b3960e0d3585bf019c85 100755 (executable)
--- a/tests/getdents.test
+++ b/tests/getdents.test
@@ -6,10 +6,7 @@
 
 rm -rf -- "$LOG".dir
 run_prog > /dev/null
-
-OUT="$LOG.out"
 run_strace -a22 -vegetdents $args > "$OUT"
-
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"
 

diff --git a/tests/getdents64.test b/tests/getdents64.test
index 9de6e4fee2491f5568aee6b5c8c6afa636644d3b..7e241c2225de1f6b05d900f7305b9517e0d1d0b0 100755 (executable)
--- a/tests/getdents64.test
+++ b/tests/getdents64.test
@@ -6,10 +6,7 @@
 
 rm -rf -- "$LOG".dir
 run_prog > /dev/null
-
-OUT="$LOG.out"
 run_strace -a24 -vegetdents64 $args > "$OUT"
-
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"
 

diff --git a/tests/getrandom.test b/tests/getrandom.test
index c4586e1d76feec4d8ed79e61616eba7f22f5b462..e47da9cd19f8144f1c1dd2d0078dca8409ccb84b 100755 (executable)
--- a/tests/getrandom.test
+++ b/tests/getrandom.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -e getrandom -xx -s3 -a32 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/getrusage.test b/tests/getrusage.test
index ed1901114955bd5705df565af4b543b7a0058bcd..97b86e1e61392cda8a885c4cb3012e42556947c2 100755 (executable)
--- a/tests/getrusage.test
+++ b/tests/getrusage.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -v -egetrusage $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/getxxid.test b/tests/getxxid.test
index d6a206a2ef16817ad2014585dce27c69269b1759..075cb298692c0e9d055e57c18f17527246fd0b06 100755 (executable)
--- a/tests/getxxid.test
+++ b/tests/getxxid.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a10 -egetxpid,getxuid,getxgid $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/inet-cmsg.test b/tests/inet-cmsg.test
index 7681fb6fd2d5153eba78c8d4900fc0403c590f7e..307679570b1341c1ce9337dd446db16f47117e58 100755 (executable)
--- a/tests/inet-cmsg.test
+++ b/tests/inet-cmsg.test
@@ -5,10 +5,7 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-
-OUT="$LOG.out"
 run_strace -erecvmsg $args > "$OUT"
-
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"
 

diff --git a/tests/init.sh b/tests/init.sh
index e793deea86d10fe56b4a3e0f7b2796fd9b908cd7..f01d147a9a6d32ea4c80677d425fcfa48e806212 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2011-2015 Dmitry V. Levin <ldv@altlinux.org>
+# Copyright (c) 2011-2016 Dmitry V. Levin <ldv@altlinux.org>
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,9 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ME_="${0##*/}"
+LOG="$ME_.tmp"
+OUT="$LOG.out"
+EXP="$LOG.exp"
 
 warn_() { printf >&2 '%s\n' "$*"; }
 fail_() { warn_ "$ME_: failed test: $*"; exit 1; }
@@ -200,7 +203,6 @@ match_grep()
 check_prog cat
 check_prog rm
 
-LOG="$ME_.tmp"
 rm -f "$LOG"
 
 : "${STRACE:=../strace}"

diff --git a/tests/ioctl.test b/tests/ioctl.test
index 152d1056f729aae2854f69fc7c72325ed319c632..94bc5d427b42a14f2967201fd22cfc376047eda1 100755 (executable)
--- a/tests/ioctl.test
+++ b/tests/ioctl.test
@@ -4,9 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
-
 run_prog > /dev/null
 run_strace -a16 -eioctl $args > "$EXP"
 check_prog grep

diff --git a/tests/ipc.sh b/tests/ipc.sh
index 32ef4238e90aa5efd8b0b23b063907c9e84706a0..752d4bb21c459f202b99d54a3254c0d78bbbd949 100644 (file)
--- a/tests/ipc.sh
+++ b/tests/ipc.sh
@@ -4,8 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-OUT="$LOG.out"
-
 run_prog > /dev/null
 run_strace -eipc $args > "$OUT"
 match_grep "$LOG" "$OUT"

diff --git a/tests/llseek.test b/tests/llseek.test
index 2c0ee51233ac47662a2de2ba10b8028bf6223ab6..cf1607edf497ba01c5c6661a266905083f7e3fd8 100755 (executable)
--- a/tests/llseek.test
+++ b/tests/llseek.test
@@ -4,9 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
-
 check_prog grep
 run_prog > /dev/null
 run_strace -e_llseek $args > "$EXP"

diff --git a/tests/lseek.test b/tests/lseek.test
index 35c2b70ac66229f7a46a40f74f10b35065a54d29..f96a91d1666fb0dd5f8555b06dbcae44524f8465 100755 (executable)
--- a/tests/lseek.test
+++ b/tests/lseek.test
@@ -4,9 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
-
 check_prog grep
 run_prog > /dev/null
 run_strace -a30 -elseek $args > "$EXP"

diff --git a/tests/membarrier.test b/tests/membarrier.test
index ff7804aa37f5b2345a769c527d1d8aff93c24108..473fe056653cb45c325c303df4c60b856d2e7c3f 100755 (executable)
--- a/tests/membarrier.test
+++ b/tests/membarrier.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a36 -emembarrier $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/mincore.test b/tests/mincore.test
index 9a6a6865a28868297a5dc14efe3e1847d862cf84..420f6535723d751194fe92ca9e2b96a4dab66bf0 100755 (executable)
--- a/tests/mincore.test
+++ b/tests/mincore.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a22 -emincore $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/mknod.test b/tests/mknod.test
index a78035315af8523bbf6831ac51eb598984ce5e0f..848ff77ed0312e7e1001c90fed87aab6d16941a1 100755 (executable)
--- a/tests/mknod.test
+++ b/tests/mknod.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -emknod -a29 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/mlock2.test b/tests/mlock2.test
index 16fa8f037a34ed419fce7bce2575f96470fd31b5..bd0c7d2c3f58950fe5ae6542de3ee88bbaa437ee 100755 (executable)
--- a/tests/mlock2.test
+++ b/tests/mlock2.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -e mlock2 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/mmap.test b/tests/mmap.test
index 846455b1a38666e51c013432f875a345cd1a7da7..1725864aede6de9a91424c2c5e94e8b39903589c 100755 (executable)
--- a/tests/mmap.test
+++ b/tests/mmap.test
@@ -49,8 +49,6 @@ else
 fi
 
 syscall=$mmap,madvise,mlockall,mprotect,mremap,msync,munmap
-EXP="$LOG.exp"
-OUT="$LOG.out"
 
 run_prog "./${ME_%.test}" $mmap > /dev/null
 run_strace -a20 -e$syscall $args > "$EXP"

diff --git a/tests/mmsg.test b/tests/mmsg.test
index 073340f73b1971fc160e7c1a0a4a44d9939af7ec..23b92411adf55bc4e5e51d1b23895bde76b32718 100755 (executable)
--- a/tests/mmsg.test
+++ b/tests/mmsg.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -e trace=recvmmsg,sendmmsg -e read=0 -e write=1 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/nanosleep.test b/tests/nanosleep.test
index 25c94acb9f5fa768a708841aad4d3266b889965e..7fa16325c8d093bc1be650cde7a2e368e2d1c441 100755 (executable)
--- a/tests/nanosleep.test
+++ b/tests/nanosleep.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=nanosleep,setitimer
 run_strace -a20 -e trace=$syscalls $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/net-y-unix.test b/tests/net-y-unix.test
index 907615897db6c4f2ae98f2b5363595d9468bb897..2c503b8d676cf6d4760ae236665a3ed16f2f3529 100755 (executable)
--- a/tests/net-y-unix.test
+++ b/tests/net-y-unix.test
@@ -38,8 +38,6 @@ check_prog sed
 addr="${ME_%.test}-local-stream"
 run_prog "./${ME_%.test}" $addr > /dev/null
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
 run_strace -a20 -y -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.
 sed -n '/socket/,$p' < "$LOG" > "$OUT"

diff --git a/tests/net-yy-inet.test b/tests/net-yy-inet.test
index 9a7c96e0cc5f4a30bdc43684413348860abf03a6..5ca2d7e52bd76b2979a663dd6bf08458b127dd1d 100755 (executable)
--- a/tests/net-yy-inet.test
+++ b/tests/net-yy-inet.test
@@ -39,8 +39,6 @@ run_prog ./netlink_inet_diag
 addr="${ME_%.test}-local-stream"
 run_prog "./${ME_%.test}" $addr > /dev/null
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
 run_strace -a22 -yy -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.
 sed -n '/socket/,$p' < "$LOG" > "$OUT"

diff --git a/tests/net-yy-unix.test b/tests/net-yy-unix.test
index 59212b78485a693d25fc97b11a5a7a0ba8fe9f60..2b5a67fb63433b1aab94f1abecce27012b79528c 100755 (executable)
--- a/tests/net-yy-unix.test
+++ b/tests/net-yy-unix.test
@@ -41,8 +41,6 @@ run_prog ./netlink_unix_diag
 addr="${ME_%.test}-local-stream"
 run_prog "./${ME_%.test}" $addr > /dev/null
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
 run_strace -a22 -yy -eclose,network $args > "$EXP"
 # Filter out close() calls made by ld.so and libc.
 sed -n '/socket/,$p' < "$LOG" > "$OUT"

diff --git a/tests/open.test b/tests/open.test
index 2135b7ff3749d13bc082659220ad01a69d7a5052..86b6ce0cd041199ddf79f40a54eefd0371e1cbbf 100755 (executable)
--- a/tests/open.test
+++ b/tests/open.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscall=${ME_%.test}
 sample=$syscall.sample
 run_strace -a30 -e$syscall -P$sample $args > "$OUT"

diff --git a/tests/openat.test b/tests/openat.test
index 122f70794070ca2267e6bf2be75a68c4139c3ff0..3614791879ad44eae20be12b6c4bce834b0eb64b 100755 (executable)
--- a/tests/openat.test
+++ b/tests/openat.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscall=${ME_%.test}
 sample=$syscall.sample
 run_strace -e$syscall -P$sample $args > "$OUT"

diff --git a/tests/opipe.test b/tests/opipe.test
index fda1b94ee8412f81dde827909bf28b90081eb353..90e6838afbbebeecf4609dd1c2f7e209b9ef0c3c 100755 (executable)
--- a/tests/opipe.test
+++ b/tests/opipe.test
@@ -4,9 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
-
 check_prog grep
 run_prog grep chdir $srcdir/umovestr.expected > "$EXP"
 run_prog ./umovestr

diff --git a/tests/personality.test b/tests/personality.test
index e3d6e671df018a49422b046be9b799739677a39b..8f8c0adbe579214d686df549275f234ab786a9ad 100755 (executable)
--- a/tests/personality.test
+++ b/tests/personality.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a20 -epersonality $args > "$OUT"
 match_grep "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/poll.test b/tests/poll.test
index 869f709292adf0c20a6dd10310decc0622ff34ab..b2cec03bf58e6f797efe7294fc1e7ee73e0b97f3 100755 (executable)
--- a/tests/poll.test
+++ b/tests/poll.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a18 -vepoll $args > "$OUT"
 match_diff "$LOG" "$OUT"
 

diff --git a/tests/pselect6.test b/tests/pselect6.test
index cf03bc0e9bf4127f8c1ec01760f4575f1b1dd78e..4383fa54b55ff67480274df9595f2c74a9d93485 100755 (executable)
--- a/tests/pselect6.test
+++ b/tests/pselect6.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -e pselect6 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 

diff --git a/tests/readdir.test b/tests/readdir.test
index df07e88e47b4d8083de5ec196aba6f98fdbe2335..775e98e6e1149644ead71de5c6a094323641e8d6 100755 (executable)
--- a/tests/readdir.test
+++ b/tests/readdir.test
@@ -6,10 +6,7 @@
 
 rm -rf -- "$LOG".dir
 run_prog > /dev/null
-
-OUT="$LOG.out"
 run_strace -a16 -ereaddir $args > "$OUT"
-
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"
 

diff --git a/tests/readlink.test b/tests/readlink.test
index 11f2569fb4429344f71e37781b36e1c2c35ed316..fbc82b1d9d06b315c2b9ee605abb4d74a9350fbc 100755 (executable)
--- a/tests/readlink.test
+++ b/tests/readlink.test
@@ -5,8 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 syscall=${ME_%.test}
-OUT="$LOG.out"
-
 run_prog > /dev/null
 run_strace -xx -e $syscall $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/readv.test b/tests/readv.test
index 48ae676635b355a844af6229e1395af8890dd5dc..d4796514407fbab68115c84b22a7ea6efb183e37 100755 (executable)
--- a/tests/readv.test
+++ b/tests/readv.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a16 -eread=0 -ewrite=1 -ereadv,writev $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/recvmsg.test b/tests/recvmsg.test
index cf1104a667d3124fb3fb6ac9782706466c6a5fac..b8a000ac2a707f97fe0cbf694f5f85171db6e1d2 100755 (executable)
--- a/tests/recvmsg.test
+++ b/tests/recvmsg.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -eread=0 -ewrite=1 -erecvmsg,sendmsg $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/rename.test b/tests/rename.test
index 6d879505c0503414e93359edb6828c332171bf45..9859530da08cc9d67e145829aa9e10fbe702da4c 100755 (executable)
--- a/tests/rename.test
+++ b/tests/rename.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -erename -a35 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/renameat.test b/tests/renameat.test
index 728b18dcd9b07376041fc3bf64115d9cc1003dae..871764ca411815a42d88888c0f26dc6149683180 100755 (executable)
--- a/tests/renameat.test
+++ b/tests/renameat.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -erenameat $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/restart_syscall.test b/tests/restart_syscall.test
index ff43bf63049872892e64cfe8e93665fcb0990ead..6dfda1686cfe063f1c8725d7ec82eaea7395f882 100755 (executable)
--- a/tests/restart_syscall.test
+++ b/tests/restart_syscall.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=nanosleep,restart_syscall
 run_strace -a20 -e trace=$syscalls $args > "$OUT"
 match_grep "$LOG" "$OUT"

diff --git a/tests/rt_sigpending.test b/tests/rt_sigpending.test
index 5218563a7f5b5e3454dfbd844397eb0d0dce94be..8398e78b799396f4e7969a3ea5f60d6c80180d80 100755 (executable)
--- a/tests/rt_sigpending.test
+++ b/tests/rt_sigpending.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a20 -ert_sigpending $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/rt_sigprocmask.test b/tests/rt_sigprocmask.test
index ea5b38bb7181276c06909f09b03785cb5fbce2ee..f2c5015a56ebb8d8c1bf2c52d0e0a00e9aca09f0 100755 (executable)
--- a/tests/rt_sigprocmask.test
+++ b/tests/rt_sigprocmask.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -ert_sigprocmask $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/rt_sigqueueinfo.test b/tests/rt_sigqueueinfo.test
index 9b7fba3792f5356177f860df7e623170da0a2fad..f7dfbcd5eafc8b0b64a0a80b6216e3c8b14ab95d 100755 (executable)
--- a/tests/rt_sigqueueinfo.test
+++ b/tests/rt_sigqueueinfo.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -ert_sigqueueinfo -esignal=none $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/rt_sigsuspend.test b/tests/rt_sigsuspend.test
index ef6636e3f06b59d8b3afbbc18ca3c493b31beb75..76e69ff38ca8997ee5099235d2a396dec1044965 100755 (executable)
--- a/tests/rt_sigsuspend.test
+++ b/tests/rt_sigsuspend.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a20 -ert_sigsuspend -esignal=none $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/rt_sigtimedwait.test b/tests/rt_sigtimedwait.test
index b8ff2e1d8f353075f0b587ecf67abf61e21061f5..e02e6266f40e3e8d5d7c5650df5d13ef03a34471 100755 (executable)
--- a/tests/rt_sigtimedwait.test
+++ b/tests/rt_sigtimedwait.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a38 -ert_sigtimedwait $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/rt_tgsigqueueinfo.test b/tests/rt_tgsigqueueinfo.test
index d2fcca5b79e064634cd0c4147954c5cb22a68e65..2662df9de7eefb668db792f1465a48470b276c29 100755 (executable)
--- a/tests/rt_tgsigqueueinfo.test
+++ b/tests/rt_tgsigqueueinfo.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -ert_tgsigqueueinfo -esignal=none $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/sched_get_priority_mxx.test b/tests/sched_get_priority_mxx.test
index 15d2475a3388f569e25bfd14ca4a3fd335eef525..36838bd522279541472ac5badc4ecedcc91ce366 100755 (executable)
--- a/tests/sched_get_priority_mxx.test
+++ b/tests/sched_get_priority_mxx.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -esched_get_priority_min,sched_get_priority_max -a33 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/sched_xetaffinity.test b/tests/sched_xetaffinity.test
index b43b5884a60335c8822221d461f76aa1f27c0085..4160e5d3ad8bda5e4e62c33f061e3c10ab537efb 100755 (executable)
--- a/tests/sched_xetaffinity.test
+++ b/tests/sched_xetaffinity.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a28 -esched_getaffinity,sched_setaffinity $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/sched_xetattr.test b/tests/sched_xetattr.test
index fe7efecef681702aab4791b3f4f46090ad4fd0c3..c2c7914c405fc9337be3a034ab744a7939d4bee0 100755 (executable)
--- a/tests/sched_xetattr.test
+++ b/tests/sched_xetattr.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -e sched_getattr,sched_setattr $args > "$OUT"
 match_grep "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/sched_xetparam.test b/tests/sched_xetparam.test
index 9627598f03090608b5391c331d92ca2477862f3c..7283df51c5a1aeda7a13e48aa6706e69682ebd1b 100755 (executable)
--- a/tests/sched_xetparam.test
+++ b/tests/sched_xetparam.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -esched_getparam,sched_setparam -a23 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/sched_xetscheduler.test b/tests/sched_xetscheduler.test
index 15d6d7303c2d79c8d2564a3983f6d517a862ad72..87a6998d646e25f89c61ae691e45de357b45a8da 100755 (executable)
--- a/tests/sched_xetscheduler.test
+++ b/tests/sched_xetscheduler.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -esched_getscheduler,sched_setscheduler -a22 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/seccomp.test b/tests/seccomp.test
index 4101cae130c63067f509ad1987bcd6bf51cb04ed..cc0da586a403694d9e42cddf431270c5e92220b2 100755 (executable)
--- a/tests/seccomp.test
+++ b/tests/seccomp.test
@@ -4,8 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-OUT="$LOG.out"
-
 run_prog > /dev/null
 run_strace -veprctl $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/select.test b/tests/select.test
index 78c25c7228b8ef0eb8323f8e92846dfba5d35716..2a1bbbd722688ec8f3ed5c5c84545dbabf93c13a 100755 (executable)
--- a/tests/select.test
+++ b/tests/select.test
@@ -6,7 +6,6 @@
 
 run_prog > /dev/null
 syscall=${ME_%.test}
-OUT="$LOG.out"
 run_strace -a36 -e$syscall $args > "$OUT"
 match_diff "$LOG" "$OUT"
 

diff --git a/tests/sendfile.test b/tests/sendfile.test
index 0d5010f7a7a9c66d0f4ad935f2cc50a13a20e9e1..ae7957f32e996b48543c2d5e6aed92519512db64 100755 (executable)
--- a/tests/sendfile.test
+++ b/tests/sendfile.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a24 -esendfile $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/sendfile64.test b/tests/sendfile64.test
index 8c11feb8334ea4053c18b589be910be31c4dbc15..980e0f74efa8d8a853b44fcc0b74edc8c8cd2306 100755 (executable)
--- a/tests/sendfile64.test
+++ b/tests/sendfile64.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a24 -esendfile64 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/splice.test b/tests/splice.test
index e3bb0936eaab7b2c0b726ac9f7e130bb4617d28e..41c3d8ab0b8a33536976f7dae331a657b5754f00 100755 (executable)
--- a/tests/splice.test
+++ b/tests/splice.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -esplice $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/statx.sh b/tests/statx.sh
index 6c9bfef76106b6f145e46ec0c30aee9434b8075d..99bfa2645777d2568a3922e3a211e3ad7eb68d48 100755 (executable)
--- a/tests/statx.sh
+++ b/tests/statx.sh
@@ -6,7 +6,6 @@
 
 syscall=${ME_%.test}
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -ve$syscall -P$syscall.sample $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/sysinfo.test b/tests/sysinfo.test
index c6170e38de97697b7929382c91325fea775b1aff..f14a900f54e8cb7cf99a2a020f4c71eb512bbd9c 100755 (executable)
--- a/tests/sysinfo.test
+++ b/tests/sysinfo.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a14 -esysinfo $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/syslog.test b/tests/syslog.test
index cc43806845590f3578a8bd8dd12914575971aa70..e216a78ffc5c225b4f510f75969fcbdbb6876852 100755 (executable)
--- a/tests/syslog.test
+++ b/tests/syslog.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -esyslog -a36 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/tee.test b/tests/tee.test
index 1bc7b3aee14e2d87054f8ab16d80df5da42783de..51124524ef6ecb2b5e0ce33e4a50621942dbb00e 100755 (executable)
--- a/tests/tee.test
+++ b/tests/tee.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -etee $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/time.test b/tests/time.test
index 6699857b2c732b0548850f99a16214fa29ad1f9f..75d35fbb65acfd3cd7745371806ba1047ace302a 100755 (executable)
--- a/tests/time.test
+++ b/tests/time.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a10 -etime $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/timer_create.test b/tests/timer_create.test
index 3a715b442863f47106ae293611f2943f5fd6429d..3dfdbbfd56a9a4625327916bcd7eeee02fb94efa 100755 (executable)
--- a/tests/timer_create.test
+++ b/tests/timer_create.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -e timer_create $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/timer_xettime.test b/tests/timer_xettime.test
index afaa21c655c46c25291ee7c770e8854d99781d88..5c4caee06293a444df4d788c7e1e586724ca3f81 100755 (executable)
--- a/tests/timer_xettime.test
+++ b/tests/timer_xettime.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=timer_create,timer_settime,timer_gettime
 run_strace -e trace=$syscalls $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/timerfd_xettime.test b/tests/timerfd_xettime.test
index 3276def72cc7f3bd2a265da8c8be183bf4f6eec0..a1d3b64225190a7c2ecc52c406d4ef998a74ccf7 100755 (executable)
--- a/tests/timerfd_xettime.test
+++ b/tests/timerfd_xettime.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=timerfd_create,timerfd_settime,timerfd_gettime
 run_strace -e trace=$syscalls $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/times-fail.test b/tests/times-fail.test
index 8d5ee4b964c5246ff5cabc891529627cf8745d58..92b4c79a3292828a32c7f99de716456ac6666377 100755 (executable)
--- a/tests/times-fail.test
+++ b/tests/times-fail.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a12 -etimes $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/times.test b/tests/times.test
index ec04015a9d1f123ddf5ed26c8266ebf96ab022cd..9be10593ffa4c6c1fe21b39f3180dd29ba748a4a 100755 (executable)
--- a/tests/times.test
+++ b/tests/times.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -etimes -esignal=none $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/truncate.test b/tests/truncate.test
index 41b0957bf1078ca5d055dd0692ac563daa71755a..0cb65f88943a432284a4834f40cd79dff8dd4c80 100755 (executable)
--- a/tests/truncate.test
+++ b/tests/truncate.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -etruncate $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/truncate64.test b/tests/truncate64.test
index 2113e069f2283898911caa100b13b788c0927746..bb1f44e05949ea54ff4b0f7b0a30d301fa9cc853 100755 (executable)
--- a/tests/truncate64.test
+++ b/tests/truncate64.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -etruncate64 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/umask.test b/tests/umask.test
index 0fe6554ff6e7a11de06f81720188ce369787bb48..816d5fec9a49d0c3ff1fe77badb625125951331b 100755 (executable)
--- a/tests/umask.test
+++ b/tests/umask.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -eumask -a11 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/umount.test b/tests/umount.test
index bcabd09b117df533261a7f69f5ff2401f103bd97..e1cd6309311d4fc9179070c616d0251965d7d49c 100755 (executable)
--- a/tests/umount.test
+++ b/tests/umount.test
@@ -9,7 +9,6 @@ case "$STRACE_ARCH" in
        alpha) syscall=oldumount ;;
        *) syscall=umount ;;
 esac
-OUT="$LOG.out"
 run_strace -a24 -s6 -e$syscall $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/umount2.test b/tests/umount2.test
index ad4b25f3f6e6f1180b356c0001d68330ff6ef9cd..8893a28da094b90bdadbaa8f359109d7ac56f2c7 100755 (executable)
--- a/tests/umount2.test
+++ b/tests/umount2.test
@@ -9,7 +9,6 @@ case "$STRACE_ARCH" in
        alpha|ia64) syscall=umount ;;
        *) syscall=umount2 ;;
 esac
-OUT="$LOG.out"
 run_strace -s7 -e$syscall $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/umovestr2.test b/tests/umovestr2.test
index 2e9fee44a77f8d5b704f1e34331454a01b5de7e8..5c5d561f91386bb3346754a5ce5cf4954f019be9 100755 (executable)
--- a/tests/umovestr2.test
+++ b/tests/umovestr2.test
@@ -4,9 +4,6 @@
 
 . "${srcdir=.}/init.sh"
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
-
 run_prog > /dev/null
 run_strace -veexecve -s262144 $args > "$EXP"
 check_prog sed

diff --git a/tests/uname.test b/tests/uname.test
index 9ba529b4be3ec7ed9beddb77ef459627bed54fbc..2e6c98d8b9daf2dd51f4feb39ecbe434377a45a4 100755 (executable)
--- a/tests/uname.test
+++ b/tests/uname.test
@@ -6,9 +6,6 @@
 
 check_prog uniq
 
-OUT="$LOG.out"
-EXP="$LOG.exp"
-
 run_prog > /dev/null
 run_strace -v -euname $args > "$EXP"
 uniq < "$LOG" > "$OUT"

diff --git a/tests/userfaultfd.test b/tests/userfaultfd.test
index 2fe46efbebdedbb093dbb26aaef5f64fc70ee667..4cd523f66be9b875360cb1ab899e2985a7f87f7a 100755 (executable)
--- a/tests/userfaultfd.test
+++ b/tests/userfaultfd.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a38 -euserfaultfd $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/utime.test b/tests/utime.test
index bb0693fc2b446a401f20e7a0ecdd5569099fa8ca..4cb95ea291f6a4d7b6b0193866ef5acbfae0cebc 100755 (executable)
--- a/tests/utime.test
+++ b/tests/utime.test
@@ -7,7 +7,6 @@
 $STRACE -e utime -h > /dev/null ||
                skip_ 'utime syscall is not supported on this architecture'
 
-OUT="$LOG.out"
 run_prog > /dev/null
 run_strace -a 16 -e utime $args > "$OUT"
 

diff --git a/tests/utimensat.test b/tests/utimensat.test
index 30b381dc7bcd6ac74d5d27e678ad2118dfc04068..52e3f3165b0be090729270dd612138e5df380e16 100755 (executable)
--- a/tests/utimensat.test
+++ b/tests/utimensat.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -e utimensat $args > "$OUT"
 
 check_prog grep

diff --git a/tests/vmsplice.test b/tests/vmsplice.test
index 0da19769d807957db0d81809c9f1403b75a7b517..6a85abdc78e5adb08f215b1398871de449912e7d 100755 (executable)
--- a/tests/vmsplice.test
+++ b/tests/vmsplice.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -ewrite=1 -evmsplice $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/xet_robust_list.test b/tests/xet_robust_list.test
index 9842eb4d8b3076eb526a747b845d1708d34a5947..46231ebde3eb29d2eccba3eb60f390147051f667 100755 (executable)
--- a/tests/xet_robust_list.test
+++ b/tests/xet_robust_list.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a24 -eget_robust_list,set_robust_list $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/xetitimer.test b/tests/xetitimer.test
index b6a6ed072e59303e975e57008b919840bcb37957..ecd31b419ccddcb7ed9e0d8116feb842312ac1e9 100755 (executable)
--- a/tests/xetitimer.test
+++ b/tests/xetitimer.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=setitimer,getitimer
 run_strace -e trace=$syscalls $args > "$OUT"
 match_diff "$LOG" "$OUT"

diff --git a/tests/xetpgid.test b/tests/xetpgid.test
index cdfec11ba655d1fbfe02572b14d2ac6a785bb770..71817a2027f59ee6b4a626b1cb8a472c091b280b 100755 (executable)
--- a/tests/xetpgid.test
+++ b/tests/xetpgid.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -a11 -egetpgid,setpgid $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/xetpriority.test b/tests/xetpriority.test
index f9b0251c4d5b9b3c6186d415fbcf8b5b9a32e403..58e52032118f3cbb50608417c048ccb182e1a8b8 100755 (executable)
--- a/tests/xetpriority.test
+++ b/tests/xetpriority.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 run_strace -egetpriority,setpriority -a29 $args > "$OUT"
 match_diff "$LOG" "$OUT"
 rm -f "$OUT"

diff --git a/tests/xettimeofday.test b/tests/xettimeofday.test
index d726ad3bf5969578f0b350a4df519f021da395ad..88bf0ec266c042b23070a8863cd69ea5b894b732 100755 (executable)
--- a/tests/xettimeofday.test
+++ b/tests/xettimeofday.test
@@ -5,7 +5,6 @@
 . "${srcdir=.}/init.sh"
 
 run_prog > /dev/null
-OUT="$LOG.out"
 syscalls=gettimeofday,settimeofday
 run_strace -a20 -e trace=$syscalls $args > "$OUT"
 match_diff "$LOG" "$OUT"