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 f61b04ec944de80a823019bb71963b2733fb7928..93428f3f65152a483f2e2fb73967177be798eb24 100755 (executable)
--- 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 42453817b999d8bf12d8556f75e211e2251d3eac..8b58664f4a610beec6462c1ccb34961ce18da699 100755 (executable)
--- 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 928731d4e4a39f4eea9405a0d9ab808c86d378a8..544715bf91c813507bfcde291ab044f2f8e2c16f 100755 (executable)
--- 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 619acd5f05279740ff3365ac15e705f0bac88f15..b3060104add04c221181515e1efcb84ba28bc660 100755 (executable)
--- 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 62911b8b5618663a6212bc4d0936806e18fa0671..0b39b8476df18a967fd4db9857cf053b573571e1 100755 (executable)
--- 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 a03350812ff6f14e49d9ff2fb5bacd91a918ed42..9de6e4fee2491f5568aee6b5c8c6afa636644d3b 100755 (executable)
--- 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 d429cdebe4da42babe39ed09ec20fba3aba43a9a..c4586e1d76feec4d8ed79e61616eba7f22f5b462 100755 (executable)
--- 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 be9f845b37f00fb01c01f85098e8a4450e7a5baf..7681fb6fd2d5153eba78c8d4900fc0403c590f7e 100755 (executable)
--- 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 49be2f6f1505a4c2e2758a762e967d40774ca0a9..7b3e3fd7b37f99332a699b06656b78f9d7cc8b2a 100755 (executable)
--- 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 e55b606b45603c96f75a26de1132e7e75033ae39..ff7804aa37f5b2345a769c527d1d8aff93c24108 100755 (executable)
--- 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 fdbcfdefcfe602ccc9b965402b32ff32bd5944c6..16fa8f037a34ed419fce7bce2575f96470fd31b5 100755 (executable)
--- 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 215f8a64099a9215a251b2aecccd82194041fd05..25c94acb9f5fa768a708841aad4d3266b889965e 100755 (executable)
--- 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 46713f186565b7470353d7f22d727e776e044cd8..cf03bc0e9bf4127f8c1ec01760f4575f1b1dd78e 100755 (executable)
--- 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 9efa18d7b8d9d2766f0ef8090b0dd73652c528a2..df07e88e47b4d8083de5ec196aba6f98fdbe2335 100755 (executable)
--- 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 ff563361382f5e7b7d5eb31cde299bb8c06acae2..579b83ffdaeca27aa5927923a728c45f26ef2e94 100755 (executable)
--- 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 289704cf8e323da1fb18232f76e035de722b5a27..d3ce0f890c4ea4dd0381664e0fb0754f5f25e040 100755 (executable)
--- 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 bf766817f85f91bcbba09f580478d32f67af1001..9b7fba3792f5356177f860df7e623170da0a2fad 100755 (executable)
--- 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 0d17221742353842bc8c10cf06ef811d2b24a306..4101cae130c63067f509ad1987bcd6bf51cb04ed 100755 (executable)
--- 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 74a78d971c1849bfd4d73eb9efc480608ae2b214..d9c76b2828c4faa5f2f4333af67a31408db20620 100755 (executable)
--- 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 0b592a2cda08b34859f34d3014394fc8542e271e..b978fd9dfaf7a513bb7c0cf2bc30f7e809e604f7 100755 (executable)
--- 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 c8eb73b0fdd9d8958313cbeeded3917c74effdcd..025e61b3cd0092f11a286fa565a4677371ce2237 100755 (executable)
--- 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 0edb1759bf7597025904ca28e6ba425feed4dc68..ab77f3016c5d36fd8d98cfcae687890a433dd7d7 100755 (executable)
--- 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 8e7e5c9dadb8fb5addb2dcea1548f825fca93f6c..370677888c5214f2121ee82fbd6b22585de85fef 100755 (executable)
--- 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 c004bd7b109501b726c3add36a91e46ffee2ccb4..6699857b2c732b0548850f99a16214fa29ad1f9f 100755 (executable)
--- 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 ffab9f9832fb928b58cecf2291d59eff8faf94bf..3a715b442863f47106ae293611f2943f5fd6429d 100755 (executable)
--- 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 90d7e756f2b616fb7ba34d7eb725fbb17b9228cb..afaa21c655c46c25291ee7c770e8854d99781d88 100755 (executable)
--- 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 ab9c0389edbaa485e68f70c52a9290e6c9167df6..3276def72cc7f3bd2a265da8c8be183bf4f6eec0 100755 (executable)
--- 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 6e596faba979791ec93564e7f1604a094dc4acb6..8d5ee4b964c5246ff5cabc891529627cf8745d58 100755 (executable)
--- 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 28ecc3e9d68ebaa41883e63f48fcb6e279bf1b46..ec04015a9d1f123ddf5ed26c8266ebf96ab022cd 100755 (executable)
--- 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 7f00d5fb09ab5bb138de9ddf4649335400fe8c45..2e9fee44a77f8d5b704f1e34331454a01b5de7e8 100755 (executable)
--- 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 b9c83682b0246191617e80555de38d8cfeb0dba7..2fe46efbebdedbb093dbb26aaef5f64fc70ee667 100755 (executable)
--- 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 7d416a79c61a15db408d575251bb2a79ccf94136..9c5628a26a8fed688daee7905841a80909920385 100755 (executable)
--- 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 762c6a131067077716f86294900216d4673ec1f6..30b381dc7bcd6ac74d5d27e678ad2118dfc04068 100755 (executable)
--- 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 b3c6db76d83c086c8fa33c1bd828089dfb48b653..9842eb4d8b3076eb526a747b845d1708d34a5947 100755 (executable)
--- 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 90694651694f5c50c578cb41b2eaf2c26dec5d31..b6a6ed072e59303e975e57008b919840bcb37957 100755 (executable)
--- 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 dbebae30ed089c1d7e38866cf8f67d0b1901a010..d726ad3bf5969578f0b350a4df519f021da395ad 100755 (executable)
--- 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