From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 30 Mar 2016 00:13:37 +0000 (+0000)
Subject: tests: move definitions of $OUT and $ERR to init.sh
X-Git-Tag: v4.12~476
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e8a7871ab509e0b628233c71467ee08fe94f70b;p=strace

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 d2583890..4abd8bc6 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 a2466e64..01405501 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 93428f3f..8b73395a 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 6248c5af..621122f6 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 ecae25fc..02230a07 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 de3f4cd8..f8c1d1cd 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 87254686..6c77ae11 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 77ec2f14..c14bcf63 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 8b58664f..1eafd4f0 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 544715bf..34569ccf 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 95c34dbf..f431927b 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 a692e191..54beff7a 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 f33dd978..839906d8 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 d2e6bc7d..d90eb6db 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 61fc16e1..d4f17dff 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 71ac29aa..052c20d9 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 599a80cb..cce58601 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 14cae625..263b6fc5 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 776d2904..f7f0ce09 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 eb4a47aa..50a0bae8 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 931d7278..e8fe393e 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 4bb95fb3..d4871b6f 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 b3060104..1676708c 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 771af7d0..3a5be2f9 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 07de2b08..2d8ae4c6 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 696151bc..9c650199 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 9b65d710..31cdf29c 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 43cd9add..abc7f02c 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 12f77edc..199765ec 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 0b39b847..a8fb2046 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 9de6e4fe..7e241c22 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 c4586e1d..e47da9cd 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 ed190111..97b86e1e 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 d6a206a2..075cb298 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 7681fb6f..30767957 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 e793deea..f01d147a 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 152d1056..94bc5d42 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 32ef4238..752d4bb2 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 2c0ee512..cf1607ed 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 35c2b70a..f96a91d1 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 ff7804aa..473fe056 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 9a6a6865..420f6535 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 a7803531..848ff77e 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 16fa8f03..bd0c7d2c 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 846455b1..1725864a 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 073340f7..23b92411 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 25c94acb..7fa16325 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 90761589..2c503b8d 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 9a7c96e0..5ca2d7e5 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 59212b78..2b5a67fb 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 2135b7ff..86b6ce0c 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 122f7079..36147918 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 fda1b94e..90e6838a 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 e3d6e671..8f8c0adb 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 869f7092..b2cec03b 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 cf03bc0e..4383fa54 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 df07e88e..775e98e6 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 11f2569f..fbc82b1d 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 48ae6766..d4796514 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 cf1104a6..b8a000ac 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 6d879505..9859530d 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 728b18dc..871764ca 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 ff43bf63..6dfda168 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 5218563a..8398e78b 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 ea5b38bb..f2c5015a 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 9b7fba37..f7dfbcd5 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 ef6636e3..76e69ff3 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 b8ff2e1d..e02e6266 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 d2fcca5b..2662df9d 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 15d2475a..36838bd5 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 b43b5884..4160e5d3 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 fe7efece..c2c7914c 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 9627598f..7283df51 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 15d6d730..87a6998d 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 4101cae1..cc0da586 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 78c25c72..2a1bbbd7 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 0d5010f7..ae7957f3 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 8c11feb8..980e0f74 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 e3bb0936..41c3d8ab 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 6c9bfef7..99bfa264 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 c6170e38..f14a900f 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 cc438068..e216a78f 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 1bc7b3ae..51124524 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 6699857b..75d35fbb 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 3a715b44..3dfdbbfd 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 afaa21c6..5c4caee0 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 3276def7..a1d3b642 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 8d5ee4b9..92b4c79a 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 ec04015a..9be10593 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 41b0957b..0cb65f88 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 2113e069..bb1f44e0 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 0fe6554f..816d5fec 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 bcabd09b..e1cd6309 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 ad4b25f3..8893a28d 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 2e9fee44..5c5d561f 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 9ba529b4..2e6c98d8 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 2fe46efb..4cd523f6 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 bb0693fc..4cb95ea2 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 30b381dc..52e3f316 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 0da19769..6a85abdc 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 9842eb4d..46231ebd 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 b6a6ed07..ecd31b41 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 cdfec11b..71817a20 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 f9b0251c..58e52032 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 d726ad3b..88bf0ec2 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"