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.

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"

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"

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"

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"

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=$!
 

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=$!
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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.

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.

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"
 

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}"

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"
 

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"
 

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

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"