From: Dmitry V. Levin Date: Thu, 26 Nov 2015 20:36:35 +0000 (+0000) Subject: tests: fix match_diff usage X-Git-Tag: v4.11~98 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c4059975542ec3a090f8277ecaa0aa43975b552;p=strace tests: fix match_diff usage Fix argument order in match_diff invocations: the first argument has to be actual output, the second argument has to be expected output. * tests/aio.test: Swap match_diff arguments. * tests/clock_nanosleep.test: Likewise. * tests/clock_xettime.test: Likewise. * tests/file_handle.test: Likewise. * tests/getdents.test: Likewise. * tests/getdents64.test: Likewise. * tests/getrandom.test: Likewise. * tests/inet-cmsg.test: Likewise. * tests/ioctl.test: Likewise. * tests/membarrier.test: Likewise. * tests/mlock2.test: Likewise. * tests/nanosleep.test: Likewise. * tests/pselect6.test: Likewise. * tests/readdir.test: Likewise. * tests/readlink.test: Likewise. * tests/readlinkat.test: Likewise. * tests/rt_sigqueueinfo.test: Likewise. * tests/seccomp.test: Likewise. * tests/select.test: Likewise. * tests/sendfile.test: Likewise. * tests/sendfile64.test: Likewise. * tests/struct_flock.test: Likewise. * tests/sysinfo.test: Likewise. * tests/time.test: Likewise. * tests/timer_create.test: Likewise. * tests/timer_xettime.test: Likewise. * tests/timerfd_xettime.test: Likewise. * tests/times-fail.test: Likewise. * tests/times.test: Likewise. * tests/umovestr2.test: Likewise. * tests/userfaultfd.test: Likewise. * tests/utime.test: Likewise. * tests/utimensat.test: Likewise. * tests/xet_robust_list.test: Likewise. * tests/xetitimer.test: Likewise. * tests/xettimeofday.test: Likewise. --- diff --git a/tests/aio.test b/tests/aio.test index f61b04ec..93428f3f 100755 --- a/tests/aio.test +++ b/tests/aio.test @@ -8,7 +8,7 @@ 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 "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/clock_nanosleep.test b/tests/clock_nanosleep.test index 42453817..8b58664f 100755 --- a/tests/clock_nanosleep.test +++ b/tests/clock_nanosleep.test @@ -8,7 +8,7 @@ run_prog > /dev/null OUT="$LOG.out" syscalls=clock_nanosleep,clock_gettime,setitimer run_strace -e trace=$syscalls $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/clock_xettime.test b/tests/clock_xettime.test index 928731d4..544715bf 100755 --- a/tests/clock_xettime.test +++ b/tests/clock_xettime.test @@ -8,7 +8,7 @@ run_prog > /dev/null OUT="$LOG.out" syscalls=clock_getres,clock_gettime,clock_settime run_strace -a36 -e trace=$syscalls $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/file_handle.test b/tests/file_handle.test index 619acd5f..b3060104 100755 --- a/tests/file_handle.test +++ b/tests/file_handle.test @@ -9,7 +9,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -ename_to_handle_at,open_by_handle_at $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/getdents.test b/tests/getdents.test index 62911b8b..0b39b847 100755 --- a/tests/getdents.test +++ b/tests/getdents.test @@ -10,7 +10,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a22 -vegetdents $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/getdents64.test b/tests/getdents64.test index a0335081..9de6e4fe 100755 --- a/tests/getdents64.test +++ b/tests/getdents64.test @@ -10,7 +10,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a24 -vegetdents64 $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/getrandom.test b/tests/getrandom.test index d429cdeb..c4586e1d 100755 --- a/tests/getrandom.test +++ b/tests/getrandom.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -e getrandom -xx -s3 -a32 $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/inet-cmsg.test b/tests/inet-cmsg.test index be9f845b..7681fb6f 100755 --- a/tests/inet-cmsg.test +++ b/tests/inet-cmsg.test @@ -9,7 +9,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -erecvmsg $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/ioctl.test b/tests/ioctl.test index 49be2f6f..7b3e3fd7 100755 --- a/tests/ioctl.test +++ b/tests/ioctl.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a16 -e ioctl $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/membarrier.test b/tests/membarrier.test index e55b606b..ff7804aa 100755 --- a/tests/membarrier.test +++ b/tests/membarrier.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a36 -emembarrier $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/mlock2.test b/tests/mlock2.test index fdbcfdef..16fa8f03 100755 --- a/tests/mlock2.test +++ b/tests/mlock2.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -e mlock2 $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/nanosleep.test b/tests/nanosleep.test index 215f8a64..25c94acb 100755 --- a/tests/nanosleep.test +++ b/tests/nanosleep.test @@ -8,7 +8,7 @@ run_prog > /dev/null OUT="$LOG.out" syscalls=nanosleep,setitimer run_strace -a20 -e trace=$syscalls $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/pselect6.test b/tests/pselect6.test index 46713f18..cf03bc0e 100755 --- a/tests/pselect6.test +++ b/tests/pselect6.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -e pselect6 $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" diff --git a/tests/readdir.test b/tests/readdir.test index 9efa18d7..df07e88e 100755 --- a/tests/readdir.test +++ b/tests/readdir.test @@ -10,7 +10,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a16 -ereaddir $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/readlink.test b/tests/readlink.test index ff563361..579b83ff 100755 --- a/tests/readlink.test +++ b/tests/readlink.test @@ -14,7 +14,7 @@ ln -snf $target $link || run_prog > /dev/null run_strace -e $syscall -xx -s3 $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f -- "$OUT" $link diff --git a/tests/readlinkat.test b/tests/readlinkat.test index 289704cf..d3ce0f89 100755 --- a/tests/readlinkat.test +++ b/tests/readlinkat.test @@ -14,7 +14,7 @@ ln -snf $target $link || run_prog > /dev/null run_strace -e $syscall -xx -s3 $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f -- "$OUT" $link diff --git a/tests/rt_sigqueueinfo.test b/tests/rt_sigqueueinfo.test index bf766817..9b7fba37 100755 --- a/tests/rt_sigqueueinfo.test +++ b/tests/rt_sigqueueinfo.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -ert_sigqueueinfo -esignal=none $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/seccomp.test b/tests/seccomp.test index 0d172217..4101cae1 100755 --- a/tests/seccomp.test +++ b/tests/seccomp.test @@ -8,7 +8,7 @@ OUT="$LOG.out" run_prog > /dev/null run_strace -veprctl $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" diff --git a/tests/select.test b/tests/select.test index 74a78d97..d9c76b28 100755 --- a/tests/select.test +++ b/tests/select.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a36 -eselect $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" diff --git a/tests/sendfile.test b/tests/sendfile.test index 0b592a2c..b978fd9d 100755 --- a/tests/sendfile.test +++ b/tests/sendfile.test @@ -8,7 +8,7 @@ exe="./${ME_%.test}" run_prog "$exe" "$exe" > /dev/null OUT="$LOG.out" run_strace -a24 -esendfile $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/sendfile64.test b/tests/sendfile64.test index c8eb73b0..025e61b3 100755 --- a/tests/sendfile64.test +++ b/tests/sendfile64.test @@ -8,7 +8,7 @@ exe="./${ME_%.test}" run_prog "$exe" "$exe" > /dev/null OUT="$LOG.out" run_strace -a24 -esendfile64 $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/struct_flock.test b/tests/struct_flock.test index 0edb1759..ab77f301 100755 --- a/tests/struct_flock.test +++ b/tests/struct_flock.test @@ -11,7 +11,7 @@ for n in fcntl fcntl64; do $STRACE -e$n -h > /dev/null && syscalls=$syscalls,$n done run_strace -e trace=$syscalls $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/sysinfo.test b/tests/sysinfo.test index 8e7e5c9d..37067788 100755 --- a/tests/sysinfo.test +++ b/tests/sysinfo.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -esysinfo $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/time.test b/tests/time.test index c004bd7b..6699857b 100755 --- a/tests/time.test +++ b/tests/time.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a10 -etime $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/timer_create.test b/tests/timer_create.test index ffab9f98..3a715b44 100755 --- a/tests/timer_create.test +++ b/tests/timer_create.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -e timer_create $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/timer_xettime.test b/tests/timer_xettime.test index 90d7e756..afaa21c6 100755 --- a/tests/timer_xettime.test +++ b/tests/timer_xettime.test @@ -8,7 +8,7 @@ run_prog > /dev/null OUT="$LOG.out" syscalls=timer_create,timer_settime,timer_gettime run_strace -e trace=$syscalls $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/timerfd_xettime.test b/tests/timerfd_xettime.test index ab9c0389..3276def7 100755 --- a/tests/timerfd_xettime.test +++ b/tests/timerfd_xettime.test @@ -8,7 +8,7 @@ run_prog > /dev/null OUT="$LOG.out" syscalls=timerfd_create,timerfd_settime,timerfd_gettime run_strace -e trace=$syscalls $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/times-fail.test b/tests/times-fail.test index 6e596fab..8d5ee4b9 100755 --- a/tests/times-fail.test +++ b/tests/times-fail.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a12 -etimes $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/times.test b/tests/times.test index 28ecc3e9..ec04015a 100755 --- a/tests/times.test +++ b/tests/times.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -etimes -esignal=none $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/umovestr2.test b/tests/umovestr2.test index 7f00d5fb..2e9fee44 100755 --- a/tests/umovestr2.test +++ b/tests/umovestr2.test @@ -11,7 +11,7 @@ run_prog > /dev/null run_strace -veexecve -s262144 $args > "$EXP" check_prog sed sed 1d < "$LOG" > "$OUT" -match_diff "$EXP" "$OUT" +match_diff "$OUT" "$EXP" rm -f "$EXP" "$OUT" diff --git a/tests/userfaultfd.test b/tests/userfaultfd.test index b9c83682..2fe46efb 100755 --- a/tests/userfaultfd.test +++ b/tests/userfaultfd.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a38 -euserfaultfd $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/utime.test b/tests/utime.test index 7d416a79..9c5628a2 100755 --- a/tests/utime.test +++ b/tests/utime.test @@ -16,7 +16,7 @@ LC_ALL=C grep -x "utime(.*" "$LOG" > /dev/null || { rm -f "$OUT" skip_ 'test executable does not use utime syscall' } -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" diff --git a/tests/utimensat.test b/tests/utimensat.test index 762c6a13..30b381dc 100755 --- a/tests/utimensat.test +++ b/tests/utimensat.test @@ -14,7 +14,7 @@ LC_ALL=C grep -x "utimensat(.*" "$LOG" > /dev/null || { skip_ 'test executable does not use utimensat syscall' } -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" diff --git a/tests/xet_robust_list.test b/tests/xet_robust_list.test index b3c6db76..9842eb4d 100755 --- a/tests/xet_robust_list.test +++ b/tests/xet_robust_list.test @@ -7,7 +7,7 @@ run_prog > /dev/null OUT="$LOG.out" run_strace -a24 -eget_robust_list,set_robust_list $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/xetitimer.test b/tests/xetitimer.test index 90694651..b6a6ed07 100755 --- a/tests/xetitimer.test +++ b/tests/xetitimer.test @@ -8,7 +8,7 @@ run_prog > /dev/null OUT="$LOG.out" syscalls=setitimer,getitimer run_strace -e trace=$syscalls $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0 diff --git a/tests/xettimeofday.test b/tests/xettimeofday.test index dbebae30..d726ad3b 100755 --- a/tests/xettimeofday.test +++ b/tests/xettimeofday.test @@ -8,7 +8,7 @@ run_prog > /dev/null OUT="$LOG.out" syscalls=gettimeofday,settimeofday run_strace -a20 -e trace=$syscalls $args > "$OUT" -match_diff "$OUT" "$LOG" +match_diff "$LOG" "$OUT" rm -f "$OUT" exit 0