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.

105 files changed, 4 insertions, 140 deletions

diff --git a/tests/acct.test b/tests/acct.test
index d25838901..4abd8bc6b 100755
--- 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 a2466e64a..014055011 100755
--- 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 93428f3f6..8b73395a4 100755
--- 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 6248c5afe..621122f68 100755
--- 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 ecae25fcc..02230a07c 100755
--- 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 de3f4cd84..f8c1d1cdf 100755
--- 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 872546869..6c77ae113 100755
--- 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 77ec2f14c..c14bcf637 100755
--- 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 8b58664f4..1eafd4f04 100755
--- 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 544715bf9..34569ccfd 100755
--- 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 95c34dbfe..f431927be 100755
--- 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 a692e1919..54beff7a2 100755
--- 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 f33dd978c..839906d8d 100755
--- 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 d2e6bc7d6..d90eb6db1 100755
--- 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 61fc16e19..d4f17dff4 100755
--- 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 71ac29aa2..052c20d96 100755
--- 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 599a80cbe..cce586014 100755
--- 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 14cae625f..263b6fc5b 100755
--- 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 776d2904a..f7f0ce09c 100755
--- 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 eb4a47aa4..50a0bae8b 100755
--- 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 931d72786..e8fe393ed 100755
--- 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 4bb95fb32..d4871b6f1 100755
--- 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 b3060104a..1676708cd 100755
--- 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 771af7d0d..3a5be2f9b 100755
--- 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 07de2b081..2d8ae4c68 100755
--- 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 696151bc3..9c6501999 100755
--- 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 9b65d7109..31cdf29c6 100755
--- 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 43cd9addd..abc7f02cd 100755
--- 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 12f77edcd..199765ec9 100755
--- 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 0b39b8476..a8fb2046a 100755
--- 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 9de6e4fee..7e241c222 100755
--- 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 c4586e1d7..e47da9cd1 100755
--- 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 ed1901114..97b86e1e6 100755
--- 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 d6a206a2e..075cb2986 100755
--- 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 7681fb6fd..307679570 100755
--- 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 e793deea8..f01d147a9 100644
--- 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 152d1056f..94bc5d427 100755
--- 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 32ef4238e..752d4bb21 100644
--- 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 2c0ee5123..cf1607edf 100755
--- 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 35c2b70ac..f96a91d16 100755
--- 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 ff7804aa3..473fe0566 100755
--- 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 9a6a6865a..420f65357 100755
--- 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 a78035315..848ff77ed 100755
--- 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 16fa8f037..bd0c7d2c3 100755
--- 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 846455b1a..1725864ae 100755
--- 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 073340f73..23b92411a 100755
--- 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 25c94acb9..7fa16325c 100755
--- 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 907615897..2c503b8d6 100755
--- 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 9a7c96e0c..5ca2d7e52 100755
--- 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 59212b784..2b5a67fb6 100755
--- 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 2135b7ff3..86b6ce0cd 100755
--- 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 122f70794..361479187 100755
--- 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 fda1b94ee..90e6838af 100755
--- 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 e3d6e671d..8f8c0adbe 100755
--- 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 869f70929..b2cec03bf 100755
--- 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 cf03bc0e9..4383fa54b 100755
--- 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 df07e88e4..775e98e6e 100755
--- 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 11f2569fb..fbc82b1d9 100755
--- 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 48ae67663..d47965144 100755
--- 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 cf1104a66..b8a000ac2 100755
--- 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 6d879505c..9859530da 100755
--- 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 728b18dcd..871764ca4 100755
--- 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 ff43bf630..6dfda1686 100755
--- 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 5218563a7..8398e78b7 100755
--- 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 ea5b38bb7..f2c5015a5 100755
--- 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 9b7fba379..f7dfbcd5e 100755
--- 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 ef6636e3f..76e69ff38 100755
--- 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 b8ff2e1d8..e02e6266f 100755
--- 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 d2fcca5b7..2662df9de 100755
--- 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 15d2475a3..36838bd52 100755
--- 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 b43b5884a..4160e5d3a 100755
--- 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 fe7efecef..c2c7914c4 100755
--- 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 9627598f0..7283df51c 100755
--- 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 15d6d7303..87a6998d6 100755
--- 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 4101cae13..cc0da586a 100755
--- 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 78c25c722..2a1bbbd72 100755
--- 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 0d5010f7a..ae7957f32 100755
--- 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 8c11feb83..980e0f74e 100755
--- 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 e3bb0936e..41c3d8ab0 100755
--- 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 6c9bfef76..99bfa2645 100755
--- 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 c6170e38d..f14a900f5 100755
--- 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 cc4380684..e216a78ff 100755
--- 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 1bc7b3aee..51124524e 100755
--- 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 6699857b2..75d35fbb6 100755
--- 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 3a715b442..3dfdbbfd5 100755
--- 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 afaa21c65..5c4caee06 100755
--- 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 3276def72..a1d3b6422 100755
--- 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 8d5ee4b96..92b4c79a3 100755
--- 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 ec04015a9..9be10593f 100755
--- 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 41b0957bf..0cb65f889 100755
--- 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 2113e069f..bb1f44e05 100755
--- 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 0fe6554ff..816d5fec9 100755
--- 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 bcabd09b1..e1cd63093 100755
--- 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 ad4b25f3f..8893a28da 100755
--- 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 2e9fee44a..5c5d561f9 100755
--- 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 9ba529b4b..2e6c98d8b 100755
--- 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 2fe46efbe..4cd523f66 100755
--- 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 bb0693fc2..4cb95ea29 100755
--- 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 30b381dc7..52e3f3165 100755
--- 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 0da19769d..6a85abdc7 100755
--- 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 9842eb4d8..46231ebde 100755
--- 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 b6a6ed072..ecd31b419 100755
--- 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 cdfec11ba..71817a202 100755
--- 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 f9b0251c4..58e520321 100755
--- 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 d726ad3bf..88bf0ec26 100755
--- 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"