]> granicus.if.org Git - strace/commitdiff
tests: cleanup temporary files removals
authorDmitry V. Levin <ldv@altlinux.org>
Mon, 3 Apr 2017 16:24:28 +0000 (16:24 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Mon, 3 Apr 2017 16:24:28 +0000 (16:24 +0000)
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.

71 files changed:
tests/attach-f-p.test
tests/attach-p-cmd.test
tests/brk.test
tests/btrfs-v.test
tests/btrfs-vw.test
tests/btrfs-w.test
tests/detach-running.test
tests/detach-sleeping.test
tests/detach-stopped.test
tests/execve-v.test
tests/execve.test
tests/fadvise64.test
tests/fstat.test
tests/getdents.test
tests/getdents64.test
tests/getuid.test
tests/init.sh
tests/ioctl.test
tests/ioctl_dm-v.test
tests/ioctl_dm.test
tests/ioctl_evdev-v.test
tests/ioctl_loop-nv.test
tests/ioctl_loop-v.test
tests/ioctl_loop.test
tests/ioctl_rtc-v.test
tests/ioctl_sock_gifconf.test
tests/ipc.sh
tests/llseek.test
tests/lseek.test
tests/mmap.test
tests/net-y-unix.test
tests/net-yy-inet.test
tests/net-yy-netlink.test
tests/net-yy-unix.test
tests/opipe.test
tests/options-syntax.test
tests/pc.test
tests/personality.test
tests/poll.test
tests/prctl-arg2-intptr.test
tests/prctl-dumpable.test
tests/prctl-name.test
tests/prctl-no-args.test
tests/prctl-pdeathsig.test
tests/prctl-seccomp-filter-v.test
tests/prctl-seccomp-strict.test
tests/prctl-securebits.test
tests/prctl-tid_address.test
tests/prctl-tsc.test
tests/pread64-pwrite64.test
tests/qual_fault.test
tests/qual_inject-retval.test
tests/qual_signal.test
tests/read-write.test
tests/readdir.test
tests/redirect-fds.test
tests/redirect.test
tests/restart_syscall.test
tests/sched.test
tests/scm_rights-fd.test
tests/seccomp-strict.test
tests/strace-S.test
tests/strace-V.test
tests/strace-ff.test
tests/strace-t.test
tests/strace-tt.test
tests/strace-ttt.test
tests/threads-execve.test
tests/umovestr2.test
tests/uname.test
tests/utimensat.test

index e5a71acf11f8ab979979c66036f9ff0532faa10d..d3aab34336a613976c3069dd81f9288b19bce1fe 100755 (executable)
@@ -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"
index b515eb81485c01062ebafeda1199c629d66aa87d..baba451fdc38aab976b494359c3b78f53553aaca 100755 (executable)
 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"
index 8c0e2e49b70a92c6690d86e3c7bfda876e664e26..3781220e18945da0f0314e87e88991d8f495ac6e 100755 (executable)
@@ -7,4 +7,3 @@
 run_prog > /dev/null
 run_strace -a10 -ebrk $args > "$EXP"
 match_grep "$LOG" "$EXP"
-rm -f "$EXP"
index 03a7cd8ffe42c084797f51f8412d783f88e96557..8cc2724a148f74edea1593d1da478e01ff225d01 100755 (executable)
@@ -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
index d97c15bccfa3718e7b1de345cb4c334612f2cc4c..913fba1605edfecfffefea647d9ac8e0df5a4afa 100755 (executable)
@@ -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
index 1fa80469f8291243d3a22f2007fd3a82cdc971f0..031f0b868ab100c546fcf07964c1a126bb219e5a 100755 (executable)
@@ -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
index af3783e8164e123620d5bd29ce894fddae1ca739..a36b70b64b09f7b2521822d9eed82e37f42da416 100755 (executable)
@@ -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
index fe6dc777f3bfcf6c1b67e3124e0458f422a25115..bd501467a6e8a8092cdf0f879f1a10f8a204d6ad 100755 (executable)
@@ -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
index 961f301966fff86aa35ba60d1687a6f9244ab86f..c46c1e81fe0a0d1f53d66fc3230c9762ac422198 100755 (executable)
@@ -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
index cce586014d753349f599baeb0a7808bead28d22d..52ff0d77410c334d93b6fc9a79844548637cedcd 100755 (executable)
@@ -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"
index 263b6fc5badc3e4b3522eff49771649d3dc3b1a1..5635a9429fa531b9565d398e1a425af8e687704b 100755 (executable)
@@ -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"
index 9f74672066f74e3af79c9dd8e80f70737475d5ca..161b28fa304977ba407c868d8e79f48a1b058f23 100755 (executable)
@@ -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"
index 2ba0fbaabcd6877ca7c96136a1170c634d392ad9..c7dbc740f0044d2ed37a5cea4533ed952d41cb4f 100755 (executable)
@@ -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"
index 23c4ac3ad596784f01f23a7e456e2efe2641d423..c180271bfa3dbc5b9e4b96aa12a4dbdff2b987e8 100755 (executable)
@@ -4,5 +4,4 @@
 
 . "${srcdir=.}/init.sh"
 
-rm -rf -- "$LOG".dir
 run_strace_match_diff -a22 -v
index 401cfc7cf2d4a5a58c9cf6391e6f6b5e2097463e..2fe232016578c1e9b4b9325e63ef8d61be564c32 100755 (executable)
@@ -4,5 +4,4 @@
 
 . "${srcdir=.}/init.sh"
 
-rm -rf -- "$LOG".dir
 run_strace_match_diff -a24 -v
index 9aaf74ba237798dd9f0baa29f5830893fb464b39..0bad1ff2156501c822538e7e4b41d0d587562a71 100755 (executable)
@@ -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"
index 803fcd65e050c6ff70da5443cf2e2fd2bc462a3b..a6fe65f09bc3d1564228b483565052518dd65194 100644 (file)
@@ -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.
index 94bc5d427b42a14f2967201fd22cfc376047eda1..1eb469ee486df85c3747a2b3b80fd84f008b7375 100755 (executable)
@@ -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
index ade3b9e85ca21ee988fe2ba8fdea770e0a66d2c3..eed37c273c8844c0b05b579af0297f995f2748a9 100755 (executable)
@@ -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"
index 64852051132f885497917acd5685402576bebc35..e9cca03bdd33bf1638032a8c6dfce2c3ca97ea35 100755 (executable)
@@ -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"
index 879410104028b2966e60a0b5e92abc12b3089277..52373ce72e7c4ccaea94f5bf2e6121ce784393d1 100755 (executable)
@@ -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"
index dcc27e1debb7d4671f3d09bf026883e12f0071bc..7d59cc2b7757bed25851654eda92af787c67b288 100755 (executable)
@@ -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"
index ff3995d87040cc6f14de1bc412798c37c86e198e..0fb224f671edf4d288f119a5c9f1a09a2e95bdca 100755 (executable)
@@ -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"
index 112cd636c67df1ab80ee08f8d010055900925760..5982d1f214535626566ba91c2c40ad57c3568e24 100755 (executable)
@@ -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"
index a255322d5640b8afc2b68f182f39545e551e1ac4..cbb4ede49a1be7fd2ede47fca983637aa6ea41ee 100755 (executable)
@@ -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"
index 2e2fc019d2227734467701771f5a274336652023..22d7ea46037ac17491100968248dc5a707847bcf 100755 (executable)
@@ -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"
index 752d4bb21c459f202b99d54a3254c0d78bbbd949..5943c1a7addd4812a1f47344a4e1c51402b4da66 100644 (file)
@@ -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
index cf1607edf497ba01c5c6661a266905083f7e3fd8..8dcd65d6ce039327397f03f877d7d93a7ed31967 100755 (executable)
@@ -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
index f96a91d1666fb0dd5f8555b06dbcae44524f8465..5b20a7f9350fdc4ba130074c62f986bcb27e8e72 100755 (executable)
@@ -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
index 1ec43c352a2938e209e9993202838f093c3753b3..09f738cd55b36dd8404787e6e2c6e671c65757a8 100755 (executable)
@@ -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"
index c5df1f9da006505710e84d0a6a36c9742919a744..ffa28780d8d6dd0fd89b0f08a0c6e40f26ce724d 100755 (executable)
 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"
index 4bebac2504b938a0ab44d287ca167fe2bc24aabe..08c4635166acf36f424107397efbe46edbef2663 100755 (executable)
        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"
index 81e04dfe7d2276d7400200d99836ff03639e3b6e..0723c3ede68f2f746c02c4d2bff827d953676811 100755 (executable)
        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"
index f85afc2992386c84ce6fa8e302dd566a34f21cf3..a660c5c158da7b0654c31f42dfc5d7ce883df777 100755 (executable)
        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"
index f658687e59bbc0a91f3701af53ca0ee8dd11e13d..f622045be3332773474e8420614b6dbe9f5ab3f1 100755 (executable)
@@ -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"
index 592b0e03413cec1fa5e88dd1724598828029c0c7..8aa7cf0cd477b3880060d2571cb620839a86ffa3 100755 (executable)
@@ -144,5 +144,3 @@ done
 [ -z "$args" ] ||
        dump_log_and_fail_with \
                "strace $args failed to print expected diagnostics"
-
-rm -f "$EXP"
index beadb7d78b285ecb9e0ebf4490383be707e24cb4..f59e86c0f11c2c12d7cdc5ebfcb587ba88e44c00 100755 (executable)
@@ -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"
index 8f8c0adbe579214d686df549275f234ab786a9ad..ab2faf48f21a4932b6a69b3033df8c035aa1b996 100755 (executable)
@@ -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"
index 09b7c50df79468f6974ae2f2198f7b180e83c220..d09193d5571f8e3337661741f550c632650b78e8 100755 (executable)
@@ -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"
index bcef806503ede60cc5a5c39cff8d9904f8533048..4f9e3a131be9b9ef6ec5dd53fe04a4a7d0b276e9 100755 (executable)
@@ -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"
index 08acb8b9a6845a500ed41cd02cfaeb41eedd0419..05f1310c57d5ee25b2df6282dd8f49f07fb8306d 100755 (executable)
@@ -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"
index 071179c55bd1321b4baf8bcd9de840af3fa41dbb..95d34b68fed6b60bcce965c3be6f23cec0202452 100755 (executable)
@@ -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"
index ce8ca67b73f7d07cdb5125d33957cc065a75e22f..8ff300b953fca1eccf8573bc34b528a099a8dfdb 100755 (executable)
@@ -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"
index 2777503ae53f0d701500752076d647d240f11296..b6e01407fbdbe45b7f7d9ed933c18bdc9adef42a 100755 (executable)
@@ -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"
index 44e4a782a7fc7db209e3b7464b1fb5507992d571..3663ad899d7a5cd78c3a3c20b8980767c0d2f57e 100755 (executable)
@@ -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"
index 19a41e6ac2357d24859705784ca160310ee31823..bee85b8b4ba162da3e26e3e543c8efc3e14765b5 100755 (executable)
@@ -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"
index c91e62a61d336d628eb06c0e7a1e5f6294e51ac8..32b0f2aa0c0c9580161b71fd8c2075a2b3c40178 100755 (executable)
@@ -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"
index dc7b7c328dcf31d8d2581776c5b61ba208aebb87..62a39e56760864e71ea9b61fcc893f9277f8b46c 100755 (executable)
@@ -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"
index a906ba894b4b2e98648121c4eedc9e18664afd21..439d9d5a41082e8a00450600a85d5975562ba939 100755 (executable)
@@ -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"
index e585406da818348a86635227244d0c5eaf1d44bc..44dafedf95f3ce5bd4ebe9cdc86049be6ca47882 100755 (executable)
@@ -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
index 49d93350f5acd2b197c885c2cecfb24ce779960c..cb8f67f50513247c45e0177dfce4d43240c6df5e 100755 (executable)
@@ -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
index 4d55196de557c01c7a21b8f20d1caedc29b5ad24..5a4efd116fd9dc93425e934fa6e886aa88f2e740 100755 (executable)
@@ -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
index eed18fd0849b584a269240cdb812085422234d5b..0f37d11be903bbaf8c03ed13a0722e277555dcef 100755 (executable)
@@ -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()
index 3700541facc50c8624baa6ee233b4b7201d1cb64..29bb4dc6399f1e078384fe8a1060f29f4a65630c 100755 (executable)
@@ -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
index e3132737fba1dcb441c29549aba57e8d035d5ac8..3f189abe1cb02a57e4284a3b4a6b41f8ec488da4 100755 (executable)
@@ -4,5 +4,4 @@
 
 . "${srcdir=.}/init.sh"
 
-rm -rf -- "$LOG".dir
 run_strace_match_diff -a16
index 6731f9480c18346a61b7715bf77b3d584e54e110..997d04cb2d82099ab5438156343224e3ebbd5904 100755 (executable)
@@ -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"
index fa0c53696c4723292aaf3900eea9098e24d18a3a..1546ddaad41ea4166625368d9d66c3086f89b3bf 100755 (executable)
@@ -74,5 +74,3 @@ $STRACE -qq -enone -esignal=none \
 if [ -s "$OUT" ]; then
        fail_ "$STRACE failed to redirect standard output"
 fi
-
-rm -f -- "$OUT"
index 6dfda1686cfe063f1c8725d7ec82eaea7395f882..f7dfa04fd63ad4720ac44b99633dd65009b784cb 100755 (executable)
@@ -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"
index 11946d910f48cb4adb79943e5faabdee6740e620..d63658e67d6603f7549f9bd6f0fdbb009e76d6fb 100755 (executable)
@@ -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"
index 767d2279cb8fc8e8baf75ed9a0992f412807a98a..a302fad14b18d121a695564169e513238b0ef008 100755 (executable)
        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"
index 0c290c64f2910b159f1ba3caf78a06e9b3bfe8e0..b0398717d9374ed85a8fea4d90b36deb8abbb150 100755 (executable)
@@ -14,4 +14,3 @@ set -- "../$NAME"
 }
 run_strace -eseccomp "$@" > "$EXP"
 match_diff "$LOG" "$EXP"
-rm -f "$EXP"
index ab077357366b59309bea37a94dba697c094e6638..64e4a41e5aa1d20ce283c1ba5dd62c9848ffde71 100755 (executable)
@@ -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"
index 7d19fa16ea5843598433435306773d07394c629e..23973fe0ff8e4c021736876d1fb8f681fe08ecd0 100755 (executable)
@@ -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"
index 4f7327914c46433dab60f803d62a6739dfb8ea59..7107527cc8dddc7f05b7382f36fc58f083f58ff8 100755 (executable)
@@ -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"
index 6ec9aa11922d733d9985ca1fd922bc9d10b92bde..d7fc742026dfcf31216c545a10d6d8907f622f3f 100755 (executable)
@@ -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"
index 36b0be9e804746e3ca7aad05d4bfd65a78d7e281..c7fea700fc436829ab78e9967f9b2217ae2ea4e2 100755 (executable)
@@ -25,4 +25,3 @@ cat > "$EXP" << __EOF__
 __EOF__
 
 match_grep "$LOG" "$EXP"
-rm -f "$EXP"
index 333b99c5376bfc0b0abf77dfde92a2b7a8f706a2..039442b704ebb4d51013ae93debd3bc369794ae1 100755 (executable)
@@ -23,4 +23,3 @@ cat > "$EXP" << __EOF__
 __EOF__
 
 match_grep "$LOG" "$EXP"
-rm -f "$EXP"
index 4a771467a6319010a755f391187260aec5993196..830856d2015cd51793f400538ee55eba82bd78eb 100755 (executable)
@@ -43,7 +43,6 @@ i=0
 while [ $i -le 9 ]; do
        run_strace "$@" > "$EXP"
        diff -- "$EXP" "$LOG" || continue
-       rm -f "$EXP"
        exit 0
 done
 
index 5c5d561f91386bb3346754a5ce5cf4954f019be9..3decbe2b9d8e6f368d043415d159b4d38853eae1 100755 (executable)
@@ -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
index 24732e10d8ed920b79fe2f3536753950ee7539bf..7ca1b5b428d64605f98684672806ba2253acae3b 100755 (executable)
@@ -15,4 +15,3 @@ run_strace -euname $args >> "$EXP"
 uniq < "$LOG" >> "$OUT"
 
 match_diff "$OUT" "$EXP"
-rm -f "$OUT" "$EXP"
index 52e3f3165b0be090729270dd612138e5df380e16..e6e2fd33a9d921d84907aa56ec2b2cef5523a1ee 100755 (executable)
@@ -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"