From c446d22fc64c06fdd595b80c834bee9c350a9a0e Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Mon, 3 Apr 2017 16:24:28 +0000 Subject: [PATCH] tests: cleanup temporary files removals As every test now runs in its own subdirectory, there is no need to remove leftover files manually by each test. * tests/init.sh (run_strace_match_diff): Do not remove $EXP. * tests/brk.test: Likewise. * tests/options-syntax.test: Likewise. * tests/qual_inject-retval.test (check_injection): Likewise. * tests/qual_signal.test (test_one_sig): Likewise. * tests/sched.test: Likewise. * tests/seccomp-strict.test: Likewise. * tests/strace-V.test: Likewise. * tests/strace-tt.test: Likewise. * tests/strace-ttt.test: Likewise. * tests/threads-execve.test: Likewise. * tests/attach-f-p.test: Use $EXP instead of $OUT, do not remove it. * tests/personality.test: Likewise. * tests/poll.test: Likewise. * tests/fstat.test: Likewise. * tests/ipc.sh: Likewise. * tests/restart_syscall.test: Likewise. * tests/utimensat.test: Likewise. * tests/attach-p-cmd.test: Likewise. Do not remove attach-p-cmd.test-lock. * tests/detach-running.test: Do not remove $LOG. * tests/detach-sleeping.test: Likewise. * tests/detach-stopped.test: Likewise. * tests/redirect.test: Do not remove $OUT. * tests/strace-S.test: Likewise. * tests/getdents.test: Do not remove $LOG.dir. * tests/getdents64.test: Likewise. * tests/readdir.test: Likewise. * tests/btrfs-v.test: Do not remove $EXP and $OUT. * tests/btrfs-vw.test: Likewise. * tests/btrfs-w.test: Likewise. * tests/execve-v.test: Likewise. * tests/execve.test: Likewise. * tests/fadvise64.test: Likewise. * tests/getuid.test: Likewise. * tests/ioctl.test: Likewise. * tests/ioctl_dm-v.test: Likewise. * tests/ioctl_dm.test: Likewise. * tests/ioctl_evdev-v.test: Likewise. * tests/ioctl_loop-nv.test: Likewise. * tests/ioctl_loop-v.test: Likewise. * tests/ioctl_loop.test: Likewise. * tests/ioctl_rtc-v.test: Likewise. * tests/ioctl_sock_gifconf.test: Likewise. * tests/llseek.test: Likewise. * tests/lseek.test: Likewise. * tests/mmap.test: Likewise. * tests/net-y-unix.test: Likewise. * tests/net-yy-inet.test: Likewise. * tests/net-yy-netlink.test: Likewise. * tests/net-yy-unix.test: Likewise. * tests/opipe.test: Likewise. * tests/prctl-arg2-intptr.test: Likewise. * tests/prctl-dumpable.test: Likewise. * tests/prctl-name.test: Likewise. * tests/prctl-no-args.test: Likewise. * tests/prctl-pdeathsig.test: Likewise. * tests/prctl-seccomp-filter-v.test: Likewise. * tests/prctl-seccomp-strict.test: Likewise. * tests/prctl-securebits.test: Likewise. * tests/prctl-tid_address.test: Likewise. * tests/prctl-tsc.test: Likewise. * tests/umovestr2.test: Likewise. * tests/uname.test: Likewise. * tests/pread64-pwrite64.test: Do nore remove pread64-pwrite64-tmpfile. * tests/read-write.test: Do nore remove read-write-tmpfile. * tests/qual_fault.test (check_fault_injection): Do not remove $EXP, $outexp, and $outgot. * tests/redirect-fds.test (check_fd): Reorder removal of work files. * tests/pc.test: Use $EXP instead of $EXPECTED, do not remove it. * tests/strace-t.test: Likewise. * tests/scm_rights-fd.test: Likewise. Use dir instead of $LOG.dir, do not remove it. * tests/strace-ff.test: Do not remove $OUT and $LOG.* files. --- tests/attach-f-p.test | 10 ++++------ tests/attach-p-cmd.test | 11 ++++------- tests/brk.test | 1 - tests/btrfs-v.test | 6 +----- tests/btrfs-vw.test | 6 +----- tests/btrfs-w.test | 6 +----- tests/detach-running.test | 1 - tests/detach-sleeping.test | 2 -- tests/detach-stopped.test | 4 ++-- tests/execve-v.test | 2 -- tests/execve.test | 2 -- tests/fadvise64.test | 1 - tests/fstat.test | 7 ++----- tests/getdents.test | 1 - tests/getdents64.test | 1 - tests/getuid.test | 1 - tests/init.sh | 1 - tests/ioctl.test | 6 +----- tests/ioctl_dm-v.test | 3 +-- tests/ioctl_dm.test | 3 +-- tests/ioctl_evdev-v.test | 3 +-- tests/ioctl_loop-nv.test | 3 +-- tests/ioctl_loop-v.test | 3 +-- tests/ioctl_loop.test | 3 +-- tests/ioctl_rtc-v.test | 3 +-- tests/ioctl_sock_gifconf.test | 3 +-- tests/ipc.sh | 6 ++---- tests/llseek.test | 4 ---- tests/lseek.test | 4 ---- tests/mmap.test | 2 -- tests/net-y-unix.test | 4 +--- tests/net-yy-inet.test | 6 ++---- tests/net-yy-netlink.test | 6 ++---- tests/net-yy-unix.test | 6 ++---- tests/opipe.test | 2 -- tests/options-syntax.test | 2 -- tests/pc.test | 8 ++------ tests/personality.test | 7 ++----- tests/poll.test | 10 ++++------ tests/prctl-arg2-intptr.test | 2 -- tests/prctl-dumpable.test | 2 -- tests/prctl-name.test | 2 -- tests/prctl-no-args.test | 2 -- tests/prctl-pdeathsig.test | 2 -- tests/prctl-seccomp-filter-v.test | 2 -- tests/prctl-seccomp-strict.test | 1 - tests/prctl-securebits.test | 2 -- tests/prctl-tid_address.test | 2 -- tests/prctl-tsc.test | 2 -- tests/pread64-pwrite64.test | 3 --- tests/qual_fault.test | 1 - tests/qual_inject-retval.test | 1 - tests/qual_signal.test | 1 - tests/read-write.test | 3 --- tests/readdir.test | 1 - tests/redirect-fds.test | 3 +-- tests/redirect.test | 2 -- tests/restart_syscall.test | 7 ++----- tests/sched.test | 2 -- tests/scm_rights-fd.test | 17 ++++------------- tests/seccomp-strict.test | 1 - tests/strace-S.test | 2 -- tests/strace-V.test | 3 +-- tests/strace-ff.test | 3 --- tests/strace-t.test | 6 ++---- tests/strace-tt.test | 1 - tests/strace-ttt.test | 1 - tests/threads-execve.test | 1 - tests/umovestr2.test | 4 ---- tests/uname.test | 1 - tests/utimensat.test | 14 ++++---------- 71 files changed, 55 insertions(+), 202 deletions(-) diff --git a/tests/attach-f-p.test b/tests/attach-f-p.test index e5a71acf..d3aab343 100755 --- a/tests/attach-f-p.test +++ b/tests/attach-f-p.test @@ -36,15 +36,13 @@ run_prog_skip_if_failed \ kill -0 $$ run_prog ../attach-f-p-cmd > /dev/null -rm -f "$OUT" -../set_ptracer_any sh -c "exec ../attach-f-p >> $OUT" > /dev/null & +../set_ptracer_any sh -c "exec ../attach-f-p >> $EXP" > /dev/null & tracee_pid=$! -while ! [ -s "$OUT" ]; do +while ! [ -s "$EXP" ]; do kill -0 $tracee_pid 2> /dev/null || fail_ 'set_ptracer_any sh failed' done -run_strace -a32 -f -echdir -p $tracee_pid ../attach-f-p-cmd > "$OUT" -match_diff "$LOG" "$OUT" -rm -f "$OUT" +run_strace -a32 -f -echdir -p $tracee_pid ../attach-f-p-cmd > "$EXP" +match_diff "$LOG" "$EXP" diff --git a/tests/attach-p-cmd.test b/tests/attach-p-cmd.test index b515eb81..baba451f 100755 --- a/tests/attach-p-cmd.test +++ b/tests/attach-p-cmd.test @@ -32,16 +32,13 @@ run_prog_skip_if_failed \ kill -0 $$ -rm -rf attach-p-cmd.test-lock -rm -f "$OUT" -../set_ptracer_any ../attach-p-cmd-p >> "$OUT" & +../set_ptracer_any ../attach-p-cmd-p >> "$EXP" & tracee_pid=$! -while ! [ -s "$OUT" ]; do +while ! [ -s "$EXP" ]; do kill -0 $tracee_pid 2> /dev/null || fail_ 'set_ptracer_any ../attach-p-cmd-p failed' done -run_strace -a30 -echdir -p $tracee_pid ../attach-p-cmd-cmd > "$OUT" -match_diff "$LOG" "$OUT" -rm -f "$OUT" +run_strace -a30 -echdir -p $tracee_pid ../attach-p-cmd-cmd > "$EXP" +match_diff "$LOG" "$EXP" diff --git a/tests/brk.test b/tests/brk.test index 8c0e2e49..3781220e 100755 --- a/tests/brk.test +++ b/tests/brk.test @@ -7,4 +7,3 @@ run_prog > /dev/null run_strace -a10 -ebrk $args > "$EXP" match_grep "$LOG" "$EXP" -rm -f "$EXP" diff --git a/tests/btrfs-v.test b/tests/btrfs-v.test index 03a7cd8f..8cc2724a 100755 --- a/tests/btrfs-v.test +++ b/tests/btrfs-v.test @@ -4,12 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog ../btrfs -v > /dev/null run_strace -a16 -veioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" - -exit 0 diff --git a/tests/btrfs-vw.test b/tests/btrfs-vw.test index d97c15bc..913fba16 100755 --- a/tests/btrfs-vw.test +++ b/tests/btrfs-vw.test @@ -18,12 +18,8 @@ elif [ ! -d "${BTRFS_MOUNTPOINT}" ]; then skip_ "\$BTRFS_MOUNTPOINT does not point to a directory" fi +check_prog grep run_prog ../btrfs -v -w "${BTRFS_MOUNTPOINT}" > /dev/null run_strace -a16 -veioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" - -exit 0 diff --git a/tests/btrfs-w.test b/tests/btrfs-w.test index 1fa80469..031f0b86 100755 --- a/tests/btrfs-w.test +++ b/tests/btrfs-w.test @@ -18,12 +18,8 @@ elif [ ! -d "${BTRFS_MOUNTPOINT}" ]; then skip_ "\$BTRFS_MOUNTPOINT does not point to a directory" fi +check_prog grep run_prog ../btrfs -w "${BTRFS_MOUNTPOINT}" > /dev/null run_strace -a16 -eioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" - -exit 0 diff --git a/tests/detach-running.test b/tests/detach-running.test index af3783e8..a36b70b6 100755 --- a/tests/detach-running.test +++ b/tests/detach-running.test @@ -54,7 +54,6 @@ cleanup() return 0 } -rm -f "$LOG" $STRACE -p $tracee_pid 2> "$LOG" & while ! grep -F "Process $tracee_pid attached" "$LOG" > /dev/null; do diff --git a/tests/detach-sleeping.test b/tests/detach-sleeping.test index fe6dc777..bd501467 100755 --- a/tests/detach-sleeping.test +++ b/tests/detach-sleeping.test @@ -36,7 +36,6 @@ check_prog sleep set -e -rm -f "$LOG" ../set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > "$LOG" & while ! [ -s "$LOG" ]; do @@ -55,7 +54,6 @@ cleanup() return 0 } -rm -f "$LOG" $STRACE -p $tracee_pid 2> "$LOG" & while ! grep -F "Process $tracee_pid attached" "$LOG" > /dev/null; do diff --git a/tests/detach-stopped.test b/tests/detach-stopped.test index 961f3019..c46c1e81 100755 --- a/tests/detach-stopped.test +++ b/tests/detach-stopped.test @@ -41,7 +41,7 @@ fi set -e -rm -f "$LOG" +> "$LOG" ../set_ptracer_any sleep $((2*$TIMEOUT_DURATION)) > "$LOG" & while ! [ -s "$LOG" ]; do @@ -62,7 +62,7 @@ cleanup() return 0 } -rm -f "$LOG" +> "$LOG" $STRACE -p $tracee_pid 2> "$LOG" & while ! grep -F "Process $tracee_pid attached" "$LOG" > /dev/null; do diff --git a/tests/execve-v.test b/tests/execve-v.test index cce58601..52ff0d77 100755 --- a/tests/execve-v.test +++ b/tests/execve-v.test @@ -11,5 +11,3 @@ run_strace -veexecve $args > "$EXP" # Filter out execve() call made by strace. grep -F test.execve < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/execve.test b/tests/execve.test index 263b6fc5..5635a942 100755 --- a/tests/execve.test +++ b/tests/execve.test @@ -11,5 +11,3 @@ run_strace -eexecve $args > "$EXP" # Filter out execve() call made by strace. grep -F test.execve < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/fadvise64.test b/tests/fadvise64.test index 9f746720..161b28fa 100755 --- a/tests/fadvise64.test +++ b/tests/fadvise64.test @@ -9,4 +9,3 @@ run_strace -e $NAME $args > "$EXP" check_prog grep grep -v "^$NAME([0123]," < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/fstat.test b/tests/fstat.test index 2ba0fbaa..c7dbc740 100755 --- a/tests/fstat.test +++ b/tests/fstat.test @@ -12,8 +12,5 @@ syscall=$NAME run_prog > /dev/null sample=$syscall.sample > "$sample" -run_strace -ve$syscall -P$sample -a21 $args > "$OUT" -match_diff "$LOG" "$OUT" -rm -f "$OUT" - -exit 0 +run_strace -ve$syscall -P$sample -a21 $args > "$EXP" +match_diff "$LOG" "$EXP" diff --git a/tests/getdents.test b/tests/getdents.test index 23c4ac3a..c180271b 100755 --- a/tests/getdents.test +++ b/tests/getdents.test @@ -4,5 +4,4 @@ . "${srcdir=.}/init.sh" -rm -rf -- "$LOG".dir run_strace_match_diff -a22 -v diff --git a/tests/getdents64.test b/tests/getdents64.test index 401cfc7c..2fe23201 100755 --- a/tests/getdents64.test +++ b/tests/getdents64.test @@ -4,5 +4,4 @@ . "${srcdir=.}/init.sh" -rm -rf -- "$LOG".dir run_strace_match_diff -a24 -v diff --git a/tests/getuid.test b/tests/getuid.test index 9aaf74ba..0bad1ff2 100755 --- a/tests/getuid.test +++ b/tests/getuid.test @@ -9,4 +9,3 @@ run_prog > /dev/null run_strace -qq -a9 -e$NAME $args > "$EXP" uniq < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$OUT" "$EXP" diff --git a/tests/init.sh b/tests/init.sh index 803fcd65..a6fe65f0 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -226,7 +226,6 @@ run_strace_match_diff() run_prog > /dev/null run_strace "$@" $args > "$EXP" match_diff "$LOG" "$EXP" - rm -f "$EXP" } # Print kernel version code. diff --git a/tests/ioctl.test b/tests/ioctl.test index 94bc5d42..1eb469ee 100755 --- a/tests/ioctl.test +++ b/tests/ioctl.test @@ -4,12 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a16 -eioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" - -exit 0 diff --git a/tests/ioctl_dm-v.test b/tests/ioctl_dm-v.test index ade3b9e8..eed37c27 100755 --- a/tests/ioctl_dm-v.test +++ b/tests/ioctl_dm-v.test @@ -4,9 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a16 -s9 -veioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/ioctl_dm.test b/tests/ioctl_dm.test index 64852051..e9cca03b 100755 --- a/tests/ioctl_dm.test +++ b/tests/ioctl_dm.test @@ -4,9 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a16 -s9 -eioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/ioctl_evdev-v.test b/tests/ioctl_evdev-v.test index 87941010..52373ce7 100755 --- a/tests/ioctl_evdev-v.test +++ b/tests/ioctl_evdev-v.test @@ -4,9 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a16 -veioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/ioctl_loop-nv.test b/tests/ioctl_loop-nv.test index dcc27e1d..7d59cc2b 100755 --- a/tests/ioctl_loop-nv.test +++ b/tests/ioctl_loop-nv.test @@ -4,9 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a22 -eioctl -e verbose=none $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/ioctl_loop-v.test b/tests/ioctl_loop-v.test index ff3995d8..0fb224f6 100755 --- a/tests/ioctl_loop-v.test +++ b/tests/ioctl_loop-v.test @@ -4,9 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a22 -v -eioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/ioctl_loop.test b/tests/ioctl_loop.test index 112cd636..5982d1f2 100755 --- a/tests/ioctl_loop.test +++ b/tests/ioctl_loop.test @@ -4,9 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a22 -eioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/ioctl_rtc-v.test b/tests/ioctl_rtc-v.test index a255322d..cbb4ede4 100755 --- a/tests/ioctl_rtc-v.test +++ b/tests/ioctl_rtc-v.test @@ -4,9 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a16 -veioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/ioctl_sock_gifconf.test b/tests/ioctl_sock_gifconf.test index 2e2fc019..22d7ea46 100755 --- a/tests/ioctl_sock_gifconf.test +++ b/tests/ioctl_sock_gifconf.test @@ -4,9 +4,8 @@ . "${srcdir=.}/init.sh" +check_prog grep run_prog > /dev/null run_strace -a28 -s1 -eioctl $args > "$EXP" -check_prog grep grep -v '^ioctl([012],' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/ipc.sh b/tests/ipc.sh index 752d4bb2..5943c1a7 100644 --- a/tests/ipc.sh +++ b/tests/ipc.sh @@ -5,9 +5,7 @@ . "${srcdir=.}/init.sh" run_prog > /dev/null -run_strace -eipc $args > "$OUT" -match_grep "$LOG" "$OUT" - -rm -f "$OUT" +run_strace -eipc $args > "$EXP" +match_grep "$LOG" "$EXP" exit 0 diff --git a/tests/llseek.test b/tests/llseek.test index cf1607ed..8dcd65d6 100755 --- a/tests/llseek.test +++ b/tests/llseek.test @@ -9,7 +9,3 @@ run_prog > /dev/null run_strace -e_llseek $args > "$EXP" grep -v '^lseek([0-9]' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" - -exit 0 diff --git a/tests/lseek.test b/tests/lseek.test index f96a91d1..5b20a7f9 100755 --- a/tests/lseek.test +++ b/tests/lseek.test @@ -9,7 +9,3 @@ run_prog > /dev/null run_strace -a30 -elseek $args > "$EXP" grep -v '^lseek([0-9]' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" - -exit 0 diff --git a/tests/mmap.test b/tests/mmap.test index 1ec43c35..09f738cd 100755 --- a/tests/mmap.test +++ b/tests/mmap.test @@ -54,5 +54,3 @@ run_prog "../$NAME" $mmap > /dev/null run_strace -a20 -e$syscall $args > "$EXP" sed -n "/^$mmap(NULL, 0, PROT_NONE,/,\$p" < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/net-y-unix.test b/tests/net-y-unix.test index c5df1f9d..ffa28780 100755 --- a/tests/net-y-unix.test +++ b/tests/net-y-unix.test @@ -36,10 +36,8 @@ check_prog sed run_prog "../$NAME" > /dev/null - run_strace -a20 -y -eclose,network $args > "$EXP" + # Filter out close() calls made by ld.so and libc. sed -n '/socket/,$p' < "$LOG" > "$OUT" - match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/net-yy-inet.test b/tests/net-yy-inet.test index 4bebac25..08c46351 100755 --- a/tests/net-yy-inet.test +++ b/tests/net-yy-inet.test @@ -34,13 +34,11 @@ framework_skip_ '/proc/self/fd/ is not available' check_prog sed -run_prog ../netlink_inet_diag +run_prog ../netlink_inet_diag run_prog "../$NAME" > /dev/null - run_strace -a22 -yy -eclose,network $args > "$EXP" + # Filter out close() calls made by ld.so and libc. sed -n '/socket/,$p' < "$LOG" > "$OUT" - match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/net-yy-netlink.test b/tests/net-yy-netlink.test index 81e04dfe..0723c3ed 100755 --- a/tests/net-yy-netlink.test +++ b/tests/net-yy-netlink.test @@ -37,13 +37,11 @@ framework_skip_ '/proc/self/fd/ is not available' check_prog sed -run_prog ../netlink_netlink_diag +run_prog ../netlink_netlink_diag run_prog "../$NAME" > /dev/null - run_strace -a22 -yy -eclose,network $args > "$EXP" + # Filter out close() calls made by ld.so and libc. sed -n '/socket/,$p' < "$LOG" > "$OUT" - match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/net-yy-unix.test b/tests/net-yy-unix.test index f85afc29..a660c5c1 100755 --- a/tests/net-yy-unix.test +++ b/tests/net-yy-unix.test @@ -36,13 +36,11 @@ framework_skip_ '/proc/self/fd/ is not available' check_prog sed -run_prog ../netlink_unix_diag +run_prog ../netlink_unix_diag run_prog "../$NAME" > /dev/null - run_strace -a22 -yy -eclose,network $args > "$EXP" + # Filter out close() calls made by ld.so and libc. sed -n '/socket/,$p' < "$LOG" > "$OUT" - match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/opipe.test b/tests/opipe.test index f658687e..f622045b 100755 --- a/tests/opipe.test +++ b/tests/opipe.test @@ -8,9 +8,7 @@ check_prog grep run_prog grep chdir $srcdir/umovestr.expected > "$EXP" run_prog ../umovestr -> "$LOG" || fail_ "failed to write $LOG" $STRACE -o "|cat > $LOG && $SLEEP_A_BIT && grep chdir < $LOG > $OUT" -e chdir $args || dump_log_and_fail_with "$STRACE $args failed" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/options-syntax.test b/tests/options-syntax.test index 592b0e03..8aa7cf0c 100755 --- a/tests/options-syntax.test +++ b/tests/options-syntax.test @@ -144,5 +144,3 @@ done [ -z "$args" ] || dump_log_and_fail_with \ "strace $args failed to print expected diagnostics" - -rm -f "$EXP" diff --git a/tests/pc.test b/tests/pc.test index beadb7d7..f59e86c0 100755 --- a/tests/pc.test +++ b/tests/pc.test @@ -47,15 +47,11 @@ addr="$(echo "$ip" |sed -r 's/^0+//')" && [ -n "$addr" ] || dump_log_and_fail_with -EXPECTED="$LOG.expected" -cat > "$EXPECTED" << __EOF__ +cat > "$EXP" << __EOF__ \\[[[:xdigit:]]{$len}\\] munmap\\(0x[[:xdigit:]]+, 0\\) += -1 .* \\[pid +$pid\\] \\[$ip\\] --- SIGSEGV \\{si_signo=SIGSEGV, si_code=SEGV_MAPERR, si_addr=0x$addr\\} --- \\[pid +$pid\\] \\[\\?{$len}\\] \\+\\+\\+ killed by SIGSEGV( \\(core dumped\\))? \\+\\+\\+ \\[\\?{$len}\\] \\+\\+\\+ exited with 0 \\+\\+\\+ __EOF__ -match_grep "$LOG" "$EXPECTED" -rm -f "$EXPECTED" - -exit 0 +match_grep "$LOG" "$EXP" diff --git a/tests/personality.test b/tests/personality.test index 8f8c0adb..ab2faf48 100755 --- a/tests/personality.test +++ b/tests/personality.test @@ -5,8 +5,5 @@ . "${srcdir=.}/init.sh" run_prog > /dev/null -run_strace -a20 -epersonality $args > "$OUT" -match_grep "$LOG" "$OUT" -rm -f "$OUT" - -exit 0 +run_strace -a20 -epersonality $args > "$EXP" +match_grep "$LOG" "$EXP" diff --git a/tests/poll.test b/tests/poll.test index 09b7c50d..d09193d5 100755 --- a/tests/poll.test +++ b/tests/poll.test @@ -5,13 +5,11 @@ . "${srcdir=.}/init.sh" run_prog > /dev/null -run_strace -a16 -vepoll $args > "$OUT" -match_diff "$LOG" "$OUT" +run_strace -a16 -vepoll $args > "$EXP" +match_diff "$LOG" "$EXP" for abbrev in 0 1 2 3 4 5; do run_prog "../$NAME" $abbrev > /dev/null - run_strace -a16 -epoll -s$abbrev $args > "$OUT" - match_diff "$LOG" "$OUT" + run_strace -a16 -epoll -s$abbrev $args > "$EXP" + match_diff "$LOG" "$EXP" done - -rm -f "$OUT" diff --git a/tests/prctl-arg2-intptr.test b/tests/prctl-arg2-intptr.test index bcef8065..4f9e3a13 100755 --- a/tests/prctl-arg2-intptr.test +++ b/tests/prctl-arg2-intptr.test @@ -10,5 +10,3 @@ run_strace -a25 -eprctl $args > "$EXP" LC_ALL=C grep -Ev '^prctl\(PR_[GS]ET_([^CEF]|.[^HNP]|..[^DEI])' \ < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-dumpable.test b/tests/prctl-dumpable.test index 08acb8b9..05f1310c 100755 --- a/tests/prctl-dumpable.test +++ b/tests/prctl-dumpable.test @@ -8,5 +8,3 @@ run_prog > /dev/null run_strace -a23 -eprctl $args > "$EXP" grep -v '^prctl(PR_[GS]ET_[^D][^U]' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-name.test b/tests/prctl-name.test index 071179c5..95d34b68 100755 --- a/tests/prctl-name.test +++ b/tests/prctl-name.test @@ -8,5 +8,3 @@ run_prog > /dev/null run_strace -a23 -eprctl $args > "$EXP" grep -v '^prctl(PR_GET_[^N][^A]' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-no-args.test b/tests/prctl-no-args.test index ce8ca67b..8ff300b9 100755 --- a/tests/prctl-no-args.test +++ b/tests/prctl-no-args.test @@ -10,5 +10,3 @@ run_prog > /dev/null run_strace -a21 -eprctl $args > "$EXP" grep -v '^prctl(PR_[GS]ET_[^KST][^EI][^CEM]' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-pdeathsig.test b/tests/prctl-pdeathsig.test index 2777503a..b6e01407 100755 --- a/tests/prctl-pdeathsig.test +++ b/tests/prctl-pdeathsig.test @@ -9,5 +9,3 @@ run_prog > /dev/null run_strace -a30 -eprctl $args > "$EXP" grep -v '^prctl(PR_[GS]ET_[^P][^D]' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-seccomp-filter-v.test b/tests/prctl-seccomp-filter-v.test index 44e4a782..3663ad89 100755 --- a/tests/prctl-seccomp-filter-v.test +++ b/tests/prctl-seccomp-filter-v.test @@ -9,5 +9,3 @@ run_prog > /dev/null run_strace -v -eprctl $args > "$EXP" grep -v '^prctl(PR_GET_' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-seccomp-strict.test b/tests/prctl-seccomp-strict.test index 19a41e6a..bee85b8b 100755 --- a/tests/prctl-seccomp-strict.test +++ b/tests/prctl-seccomp-strict.test @@ -16,4 +16,3 @@ set -- "../$NAME" run_strace -eprctl "$@" > "$EXP" grep -v '^prctl(PR_GET_' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-securebits.test b/tests/prctl-securebits.test index c91e62a6..32b0f2aa 100755 --- a/tests/prctl-securebits.test +++ b/tests/prctl-securebits.test @@ -8,5 +8,3 @@ run_prog > /dev/null run_strace -a25 -eprctl $args > "$EXP" grep -v '^prctl(PR_[GS]ET_[^S][^E][^C][^U]' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-tid_address.test b/tests/prctl-tid_address.test index dc7b7c32..62a39e56 100755 --- a/tests/prctl-tid_address.test +++ b/tests/prctl-tid_address.test @@ -8,5 +8,3 @@ run_prog > /dev/null run_strace -a23 -eprctl $args > "$EXP" LC_ALL=C grep -Ev '^prctl\(PR_[GS]ET_([^T]|.[^I]|..[^D])' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/prctl-tsc.test b/tests/prctl-tsc.test index a906ba89..439d9d5a 100755 --- a/tests/prctl-tsc.test +++ b/tests/prctl-tsc.test @@ -9,5 +9,3 @@ run_prog > /dev/null run_strace -a24 -eprctl $args > "$EXP" grep -v '^prctl(PR_[GS]ET_[^T][^S]' < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" diff --git a/tests/pread64-pwrite64.test b/tests/pread64-pwrite64.test index e585406d..44dafedf 100755 --- a/tests/pread64-pwrite64.test +++ b/tests/pread64-pwrite64.test @@ -9,10 +9,7 @@ framework_skip_ '/proc/self/fd/ is not available' tmpfile=pread64-pwrite64-tmpfile -> $tmpfile run_strace_match_diff \ -a21 -eread=0 -ewrite=1 -e trace=pread64,pwrite64 \ -P $tmpfile -P /dev/zero -P /dev/null - -rm -f $tmpfile diff --git a/tests/qual_fault.test b/tests/qual_fault.test index 49d93350..cb8f67f5 100755 --- a/tests/qual_fault.test +++ b/tests/qual_fault.test @@ -81,7 +81,6 @@ check_fault_injection() match_diff "$EXP" "$LOG" match_diff "$outexp" "$outgot" - rm -f "$EXP" "$outexp" "$outgot" } for err in '' ENOSYS 22 einval; do diff --git a/tests/qual_inject-retval.test b/tests/qual_inject-retval.test index 4d55196d..5a4efd11 100755 --- a/tests/qual_inject-retval.test +++ b/tests/qual_inject-retval.test @@ -14,7 +14,6 @@ check_injection() run_strace -a12 -e$syscall -einject="$syscall:retval=$rval" "$@" \ ../qual_inject-retval "$rval" > "$EXP" match_diff "$LOG" "$EXP" - rm -f "$EXP" } check_injection 0 diff --git a/tests/qual_signal.test b/tests/qual_signal.test index eed18fd0..0f37d11b 100755 --- a/tests/qual_signal.test +++ b/tests/qual_signal.test @@ -37,7 +37,6 @@ test_one_sig() run_prog "../$NAME" "$@" > /dev/null run_strace -e trace=none -e signal="$sigs" "../$NAME" "$@" > "$EXP" match_diff "$LOG" "$EXP" - rm -f "$EXP" } test_sigs() diff --git a/tests/read-write.test b/tests/read-write.test index 3700541f..29bb4dc6 100755 --- a/tests/read-write.test +++ b/tests/read-write.test @@ -9,10 +9,7 @@ framework_skip_ '/proc/self/fd/ is not available' tmpfile=read-write-tmpfile -> $tmpfile run_strace_match_diff \ -a15 -eread=0 -ewrite=1 -e trace=read,write \ -P $tmpfile -P /dev/zero -P /dev/null - -rm -f $tmpfile diff --git a/tests/readdir.test b/tests/readdir.test index e3132737..3f189abe 100755 --- a/tests/readdir.test +++ b/tests/readdir.test @@ -4,5 +4,4 @@ . "${srcdir=.}/init.sh" -rm -rf -- "$LOG".dir run_strace_match_diff -a16 diff --git a/tests/redirect-fds.test b/tests/redirect-fds.test index 6731f948..997d04cb 100755 --- a/tests/redirect-fds.test +++ b/tests/redirect-fds.test @@ -47,6 +47,7 @@ check_fd() a2="$2" a3="$3" + rm -f "$LOG" "$fd0" "$fd1" "$fd2" touch "$LOG" "$fd0" || framework_skip_ 'failed to create files' @@ -57,8 +58,6 @@ check_fd() set -- "$STRACE" -o"$LOG" -echdir "$@" eval "$@" "<${a1:-&-}" ">${a2:-&-}" "2>${a3:-&-}" || dump_log_and_fail_with "$* failed with code $?" - - rm -f "$LOG" "$fd0" "$fd1" "$fd2" } check_fd "$fd0" "$fd1" "$fd2" diff --git a/tests/redirect.test b/tests/redirect.test index fa0c5369..1546ddaa 100755 --- a/tests/redirect.test +++ b/tests/redirect.test @@ -74,5 +74,3 @@ $STRACE -qq -enone -esignal=none \ if [ -s "$OUT" ]; then fail_ "$STRACE failed to redirect standard output" fi - -rm -f -- "$OUT" diff --git a/tests/restart_syscall.test b/tests/restart_syscall.test index 6dfda168..f7dfa04f 100755 --- a/tests/restart_syscall.test +++ b/tests/restart_syscall.test @@ -6,8 +6,5 @@ run_prog > /dev/null syscalls=nanosleep,restart_syscall -run_strace -a20 -e trace=$syscalls $args > "$OUT" -match_grep "$LOG" "$OUT" -rm -f "$OUT" - -exit 0 +run_strace -a20 -e trace=$syscalls $args > "$EXP" +match_grep "$LOG" "$EXP" diff --git a/tests/sched.test b/tests/sched.test index 11946d91..d63658e6 100755 --- a/tests/sched.test +++ b/tests/sched.test @@ -51,5 +51,3 @@ while read s; do { run_strace -qq -esignal=none -e%sched ../$s > /dev/null match_diff "$LOG" /dev/null } < /dev/null; done < negative.list - -rm "$EXP" diff --git a/tests/scm_rights-fd.test b/tests/scm_rights-fd.test index 767d2279..a302fad1 100755 --- a/tests/scm_rights-fd.test +++ b/tests/scm_rights-fd.test @@ -34,16 +34,13 @@ framework_skip_ '/proc/self/fd/ is not available' check_prog mkdir -check_prog rm check_prog seq check_prog touch -dir="$LOG.dir" -rm -rf -- "$dir" -mkdir -- "$dir" || +mkdir dir || framework_skip_ 'failed to create a directory' -file="$dir/$(for i in $(seq 1 127); do echo A; done; echo Z)" +file="dir/$(for i in $(seq 1 127); do echo A; done; echo Z)" touch -- "$file" || framework_skip_ 'failed to create a file' @@ -66,15 +63,9 @@ msg_tail=', msg_controllen='"$n"', msg_flags=0' rights='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_RIGHTS, cmsg_data='"$rights_data"'\}' creds='\{cmsg_len='"$n"', cmsg_level=SOL_SOCKET, cmsg_type=SCM_CREDENTIALS, cmsg_data='"$ids"'\}' -EXPECTED="$LOG.expected" - -cat > "$EXPECTED" << __EOF__ +cat > "$EXP" << __EOF__ sendmsg\\(3$socket, $msg_head\\[$rights\\]$msg_tail\\}, 0\\) = 15 recvmsg\\(0$socket, $msg_head\\[$creds, $rights\\]$msg_tail\\}, 0\\) = 15 __EOF__ -match_grep "$LOG" "$EXPECTED" -rm -f "$EXPECTED" -rm -rf -- "$dir" - -exit 0 +match_grep "$LOG" "$EXP" diff --git a/tests/seccomp-strict.test b/tests/seccomp-strict.test index 0c290c64..b0398717 100755 --- a/tests/seccomp-strict.test +++ b/tests/seccomp-strict.test @@ -14,4 +14,3 @@ set -- "../$NAME" } run_strace -eseccomp "$@" > "$EXP" match_diff "$LOG" "$EXP" -rm -f "$EXP" diff --git a/tests/strace-S.test b/tests/strace-S.test index ab077357..64e4a41e 100755 --- a/tests/strace-S.test +++ b/tests/strace-S.test @@ -28,5 +28,3 @@ test_c() c='[[:space:]]+([^[:space:]]+)' test_c calls '-n -r' '/^[[:space:]]+[0-9]/ s/^'"$c$c$c$c"'[[:space:]].*/\4/p' test_c name '' '/^[[:space:]]+[0-9]/ s/^'"$c$c$c$c"'([[:space:]]+[0-9]+)?'"$c"'$/\6/p' - -rm -f "$OUT" diff --git a/tests/strace-V.test b/tests/strace-V.test index 7d19fa16..23973fe0 100755 --- a/tests/strace-V.test +++ b/tests/strace-V.test @@ -21,5 +21,4 @@ This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. __EOF__ -match_diff "$EXP" "$LOG" -rm -f "$EXP" +match_diff "$LOG" "$EXP" diff --git a/tests/strace-ff.test b/tests/strace-ff.test index 4f732791..7107527c 100755 --- a/tests/strace-ff.test +++ b/tests/strace-ff.test @@ -15,7 +15,6 @@ while ! [ -s "$OUT" ]; do fail_ 'set_ptracer_any sleep failed' done -rm -f "$LOG".* run_strace -a14 -eexit_group -ff -p $tracee_pid # check that output matches @@ -25,5 +24,3 @@ match_diff "$LOG.$tracee_pid" set -- "$LOG".* [ "$LOG.$tracee_pid" = "$*" ] || fail_ "too many output files: $*" - -rm -f "$OUT" "$LOG.$tracee_pid" diff --git a/tests/strace-t.test b/tests/strace-t.test index 6ec9aa11..d7fc7420 100755 --- a/tests/strace-t.test +++ b/tests/strace-t.test @@ -11,10 +11,8 @@ t0="$(date +%T)" run_strace -t -eexecve $args t1="$(date +%T)" -EXPECTED="$LOG.expected" -cat > "$EXPECTED" << __EOF__ +cat > "$EXP" << __EOF__ ($t0|$t1) execve\\("\\.\\./sleep", \\["\\.\\./sleep", "0"\\], \\[/\\* [[:digit:]]+ vars \\*/\\]\\) = 0 __EOF__ -match_grep "$LOG" "$EXPECTED" -rm -f "$EXPECTED" +match_grep "$LOG" "$EXP" diff --git a/tests/strace-tt.test b/tests/strace-tt.test index 36b0be9e..c7fea700 100755 --- a/tests/strace-tt.test +++ b/tests/strace-tt.test @@ -25,4 +25,3 @@ cat > "$EXP" << __EOF__ __EOF__ match_grep "$LOG" "$EXP" -rm -f "$EXP" diff --git a/tests/strace-ttt.test b/tests/strace-ttt.test index 333b99c5..039442b7 100755 --- a/tests/strace-ttt.test +++ b/tests/strace-ttt.test @@ -23,4 +23,3 @@ cat > "$EXP" << __EOF__ __EOF__ match_grep "$LOG" "$EXP" -rm -f "$EXP" diff --git a/tests/threads-execve.test b/tests/threads-execve.test index 4a771467..830856d2 100755 --- a/tests/threads-execve.test +++ b/tests/threads-execve.test @@ -43,7 +43,6 @@ i=0 while [ $i -le 9 ]; do run_strace "$@" > "$EXP" diff -- "$EXP" "$LOG" || continue - rm -f "$EXP" exit 0 done diff --git a/tests/umovestr2.test b/tests/umovestr2.test index 5c5d561f..3decbe2b 100755 --- a/tests/umovestr2.test +++ b/tests/umovestr2.test @@ -9,7 +9,3 @@ run_strace -veexecve -s262144 $args > "$EXP" check_prog sed sed 1d < "$LOG" > "$OUT" match_diff "$OUT" "$EXP" - -rm -f "$EXP" "$OUT" - -exit 0 diff --git a/tests/uname.test b/tests/uname.test index 24732e10..7ca1b5b4 100755 --- a/tests/uname.test +++ b/tests/uname.test @@ -15,4 +15,3 @@ run_strace -euname $args >> "$EXP" uniq < "$LOG" >> "$OUT" match_diff "$OUT" "$EXP" -rm -f "$OUT" "$EXP" diff --git a/tests/utimensat.test b/tests/utimensat.test index 52e3f316..e6e2fd33 100755 --- a/tests/utimensat.test +++ b/tests/utimensat.test @@ -5,16 +5,10 @@ . "${srcdir=.}/init.sh" run_prog > /dev/null -run_strace -e utimensat $args > "$OUT" +run_strace -e $NAME $args > "$EXP" check_prog grep -LC_ALL=C grep -x "utimensat(.*" "$LOG" > /dev/null || { - rm -f "$OUT" - skip_ 'test executable does not use utimensat syscall' -} +LC_ALL=C grep -x "$NAME(.*" "$LOG" > /dev/null || + skip_ "../$NAME executable does not use $NAME syscall" -match_diff "$LOG" "$OUT" - -rm -f "$OUT" - -exit 0 +match_diff "$LOG" "$EXP" -- 2.50.1