tests: convert several tests from match_grep to match_diff

* tests/sendfile.test: Use match_diff instead of match_grep.
* tests/sendfile64.test: Likewise.
* tests/time.test: Likewise.
* tests/utime.test: Likewise.
* tests/xet_robust_list.test: Likewise.
* tests/sendfile.c (main): Update match patterns for match_diff.
* tests/sendfile64.c (main): Likewise.
* tests/time.c (main): Likewise.
* tests/utime.c (main): Likewise.
* tests/xet_robust_list.c (main): Likewise.

diff --git a/tests/sendfile.c b/tests/sendfile.c
index 6f71a5b0c8777b24379c5086452aff51aa7d4275..a03f0902bbeb334549dcdbbd6e8c602ab36868e4 100644 (file)
--- a/tests/sendfile.c
+++ b/tests/sendfile.c
@@ -70,7 +70,7 @@ main(int ac, const char **av)
        if (!syscall(__NR_sendfile, 0, 1, NULL, page_len) ||
            EBADF != errno)
                return 77;
-       printf("sendfile\\(0, 1, NULL, %lu\\) += -1 EBADF .*\n",
+       printf("sendfile(0, 1, NULL, %lu) = -1 EBADF (Bad file descriptor)\n",
               (unsigned long) page_len);
 
        void *p = mmap(NULL, page_len * 2, PROT_READ | PROT_WRITE,
@@ -80,18 +80,18 @@ main(int ac, const char **av)
 
        if (!syscall(__NR_sendfile, 0, 1, p + page_len, page_len))
                return 77;
-       printf("sendfile\\(0, 1, %#lx, %lu\\) += -1 EFAULT .*\n",
+       printf("sendfile(0, 1, %#lx, %lu) = -1 EFAULT (Bad address)\n",
               (unsigned long) p + page_len, (unsigned long) page_len);
 
        if (syscall(__NR_sendfile, sv[1], reg_in, NULL, alen) != (long) alen)
                return 77;
-       printf("sendfile\\(%d, %d, NULL, %lu\\) += %lu\n",
+       printf("sendfile(%d, %d, NULL, %lu) = %lu\n",
               sv[1], reg_in, (unsigned long) alen,
               (unsigned long) alen);
 
        uint32_t *p_off = p + page_len - sizeof(uint32_t);
        if (syscall(__NR_sendfile, sv[1], reg_in, p_off, alen) != (long) alen) {
-               printf("sendfile\\(%d, %d, %#lx, %lu\\) += -1 EFAULT .*\n",
+               printf("sendfile(%d, %d, %#lx, %lu) = -1 EFAULT (Bad address)\n",
                       sv[1], reg_in, (unsigned long) p_off,
                       (unsigned long) alen);
                --p_off;
@@ -99,14 +99,14 @@ main(int ac, const char **av)
                    != (long) alen)
                        return 77;
        }
-       printf("sendfile\\(%d, %d, \\[0\\] => \\[%lu\\], %lu\\) += %lu\n",
+       printf("sendfile(%d, %d, [0] => [%lu], %lu) = %lu\n",
               sv[1], reg_in, (unsigned long) alen,
               (unsigned long) alen, (unsigned long) alen);
 
        if (syscall(__NR_sendfile, sv[1], reg_in, p_off, stb.st_size + 1)
            != (long) blen)
                return 77;
-       printf("sendfile\\(%d, %d, \\[%lu\\] => \\[%lu\\], %lu\\) += %lu\n",
+       printf("sendfile(%d, %d, [%lu] => [%lu], %lu) = %lu\n",
               sv[1], reg_in, (unsigned long) alen,
               (unsigned long) stb.st_size,
               (unsigned long) stb.st_size + 1,
@@ -117,7 +117,7 @@ main(int ac, const char **av)
                *p_off64 = 0xcafef00dfacefeed;
                if (!syscall(__NR_sendfile, sv[1], reg_in, p_off64, 1))
                        return 77;
-               printf("sendfile\\(%d, %d, \\[14627392582579060461\\], 1\\) += -1 EINVAL .*\n",
+               printf("sendfile(%d, %d, [14627392582579060461], 1) = -1 EINVAL (Invalid argument)\n",
                       sv[1], reg_in);
                *p_off64 = 0xdefaced;
        } else {
@@ -125,9 +125,10 @@ main(int ac, const char **av)
        }
        if (syscall(__NR_sendfile, sv[1], reg_in, p_off, 1))
                return 77;
-       printf("sendfile\\(%d, %d, \\[233811181\\], 1\\) += 0\n",
+       printf("sendfile(%d, %d, [233811181], 1) = 0\n",
               sv[1], reg_in);
 
+       puts("+++ exited with 0 +++");
        return 0;
 }
 

diff --git a/tests/sendfile.test b/tests/sendfile.test
index 23aacac732a727237658ffb0b222a7ebf711cef3..0b592a2cda08b34859f34d3014394fc8542e271e 100755 (executable)
--- a/tests/sendfile.test
+++ b/tests/sendfile.test
@@ -7,8 +7,8 @@
 exe="./${ME_%.test}"
 run_prog "$exe" "$exe" > /dev/null
 OUT="$LOG.out"
-run_strace -esendfile $args > "$OUT"
-match_grep "$LOG" "$OUT"
+run_strace -a24 -esendfile $args > "$OUT"
+match_diff "$OUT" "$LOG"
 rm -f "$OUT"
 
 exit 0

diff --git a/tests/sendfile64.c b/tests/sendfile64.c
index d52fbadb59aafad7eea30a4e880c84c6b3396fed..a37d61b27d00c1b331b29e7ee0dd743b2c4aae1b 100644 (file)
--- a/tests/sendfile64.c
+++ b/tests/sendfile64.c
@@ -70,7 +70,7 @@ main(int ac, const char **av)
        if (!syscall(__NR_sendfile64, 0, 1, NULL, page_len) ||
            EBADF != errno)
                return 77;
-       printf("sendfile64\\(0, 1, NULL, %lu\\) += -1 EBADF .*\n",
+       printf("sendfile64(0, 1, NULL, %lu) = -1 EBADF (Bad file descriptor)\n",
               (unsigned long) page_len);
 
        void *p = mmap(NULL, page_len * 2, PROT_READ | PROT_WRITE,
@@ -80,26 +80,26 @@ main(int ac, const char **av)
 
        if (!syscall(__NR_sendfile64, 0, 1, p + page_len, page_len))
                return 77;
-       printf("sendfile64\\(0, 1, %#lx, %lu\\) += -1 EFAULT .*\n",
+       printf("sendfile64(0, 1, %#lx, %lu) = -1 EFAULT (Bad address)\n",
               (unsigned long) p + page_len, (unsigned long) page_len);
 
        if (syscall(__NR_sendfile64, sv[1], reg_in, NULL, alen) != (long) alen)
                return 77;
-       printf("sendfile64\\(%d, %d, NULL, %lu\\) += %lu\n",
+       printf("sendfile64(%d, %d, NULL, %lu) = %lu\n",
               sv[1], reg_in, (unsigned long) alen,
               (unsigned long) alen);
 
        uint64_t *p_off = p + page_len - sizeof(uint64_t);
        if (syscall(__NR_sendfile64, sv[1], reg_in, p_off, alen) != (long) alen)
                return 77;
-       printf("sendfile64\\(%d, %d, \\[0\\] => \\[%lu\\], %lu\\) += %lu\n",
+       printf("sendfile64(%d, %d, [0] => [%lu], %lu) = %lu\n",
               sv[1], reg_in, (unsigned long) alen,
               (unsigned long) alen, (unsigned long) alen);
 
        if (syscall(__NR_sendfile64, sv[1], reg_in, p_off, stb.st_size + 1)
            != (long) blen)
                return 77;
-       printf("sendfile64\\(%d, %d, \\[%lu\\] => \\[%lu\\], %lu\\) += %lu\n",
+       printf("sendfile64(%d, %d, [%lu] => [%lu], %lu) = %lu\n",
               sv[1], reg_in, (unsigned long) alen,
               (unsigned long) stb.st_size,
               (unsigned long) stb.st_size + 1,
@@ -108,15 +108,17 @@ main(int ac, const char **av)
        *p_off = 0xcafef00dfacefeed;
        if (!syscall(__NR_sendfile64, sv[1], reg_in, p_off, 1))
                return 77;
-       printf("sendfile64\\(%d, %d, \\[14627392582579060461\\], 1\\) += -1 EINVAL .*\n",
+       printf("sendfile64(%d, %d, [14627392582579060461], 1)"
+               " = -1 EINVAL (Invalid argument)\n",
               sv[1], reg_in);
 
        *p_off = 0xfacefeed;
        if (syscall(__NR_sendfile64, sv[1], reg_in, p_off, 1))
                return 77;
-       printf("sendfile64\\(%d, %d, \\[4207869677\\], 1\\) += 0\n",
+       printf("sendfile64(%d, %d, [4207869677], 1) = 0\n",
               sv[1], reg_in);
 
+       puts("+++ exited with 0 +++");
        return 0;
 }
 

diff --git a/tests/sendfile64.test b/tests/sendfile64.test
index a50bb8851471f939fb8595543169b6d22022321d..c8eb73b0fdd9d8958313cbeeded3917c74effdcd 100755 (executable)
--- a/tests/sendfile64.test
+++ b/tests/sendfile64.test
@@ -7,8 +7,8 @@
 exe="./${ME_%.test}"
 run_prog "$exe" "$exe" > /dev/null
 OUT="$LOG.out"
-run_strace -esendfile64 $args > "$OUT"
-match_grep "$LOG" "$OUT"
+run_strace -a24 -esendfile64 $args > "$OUT"
+match_diff "$OUT" "$LOG"
 rm -f "$OUT"
 
 exit 0

diff --git a/tests/time.c b/tests/time.c
index 2726b2d0694a6c52b69acf5e035ddc5b5750f44a..7a9d353d18b6225628a8fe1511912c1f47da6ff6 100644 (file)
--- a/tests/time.c
+++ b/tests/time.c
@@ -27,8 +27,9 @@ main(void)
        if ((time_t) -1 == t || t != *p_t)
                return 77;
 
-       printf("time\\(\\[%jd\\]\\) += %jd\n", (intmax_t) t, (intmax_t) t);
+       printf("time([%jd]) = %jd\n", (intmax_t) t, (intmax_t) t);
 
+       puts("+++ exited with 0 +++");
        return 0;
 }
 

diff --git a/tests/time.test b/tests/time.test
index 90b1bfb6d28e33f98e09f21106b04526a854715b..c004bd7b109501b726c3add36a91e46ffee2ccb4 100755 (executable)
--- a/tests/time.test
+++ b/tests/time.test
@@ -6,8 +6,8 @@
 
 run_prog > /dev/null
 OUT="$LOG.out"
-run_strace -etime $args > "$OUT"
-match_grep "$LOG" "$OUT"
+run_strace -a10 -etime $args > "$OUT"
+match_diff "$OUT" "$LOG"
 rm -f "$OUT"
 
 exit 0

diff --git a/tests/utime.c b/tests/utime.c
index 0298b27f96392d2b318177812fc50d78668cf347..c1af785bae32f69d0dd5b3b7730abb825fc5242a 100644 (file)
--- a/tests/utime.c
+++ b/tests/utime.c
@@ -18,11 +18,12 @@ main(void)
        struct utimbuf u = { .actime = t, .modtime = t };
        struct tm *p = localtime(&t);
 
-       printf("utime\\(\"utime\\\\nfilename\", \\[");
+       printf("utime(\"utime\\nfilename\", [");
        print_tm(p);
        printf(", ");
        print_tm(p);
-       printf("\\]\\) += -1 ENOENT .*\n");
+       puts("]) = -1 ENOENT (No such file or directory)");
+       puts("+++ exited with 0 +++");
 
        return utime("utime\nfilename", &u) == -1 && errno == ENOENT ? 0 : 77;
 }

diff --git a/tests/utime.test b/tests/utime.test
index 2ebd4b9300a54b9e7e8cec828a6a0bc821a42d75..7d416a79c61a15db408d575251bb2a79ccf94136 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_grep "$LOG" "$OUT"
+match_diff "$OUT" "$LOG"
 
 rm -f "$OUT"
 

diff --git a/tests/xet_robust_list.c b/tests/xet_robust_list.c
index ddcdd505117330f36c0da2d114c285c990756b04..fbe903a30b08633f2a1fcdae117105345bb6b7b5 100644 (file)
--- a/tests/xet_robust_list.c
+++ b/tests/xet_robust_list.c
@@ -28,19 +28,20 @@ main(void)
 
        if (syscall(__NR_get_robust_list, long_pid, p_head, p_len))
                return 77;
-       printf("get_robust_list\\(%d, \\[%#lx\\], \\[%lu\\]\\) += 0\n",
+       printf("get_robust_list(%d, [%#lx], [%lu]) = 0\n",
               (int) pid, (unsigned long) *p_head, (unsigned long) *p_len);
 
        if (syscall(__NR_set_robust_list, p, *p_len))
                return 77;
-       printf("set_robust_list\\(%#lx, %lu\\) += 0\n",
+       printf("set_robust_list(%#lx, %lu) = 0\n",
               (unsigned long) p, (unsigned long) *p_len);
 
        if (syscall(__NR_get_robust_list, long_pid, p_head, p_len))
                return 77;
-       printf("get_robust_list\\(%d, \\[%#lx\\], \\[%lu\\]\\) += 0\n",
+       printf("get_robust_list(%d, [%#lx], [%lu]) = 0\n",
               (int) pid, (unsigned long) *p_head, (unsigned long) *p_len);
 
+       puts("+++ exited with 0 +++");
        return 0;
 }
 

diff --git a/tests/xet_robust_list.test b/tests/xet_robust_list.test
index 9568c1d1f5e39ba8296f968cbe8ffc60f1fec109..b3c6db76d83c086c8fa33c1bd828089dfb48b653 100755 (executable)
--- a/tests/xet_robust_list.test
+++ b/tests/xet_robust_list.test
@@ -6,8 +6,8 @@
 
 run_prog > /dev/null
 OUT="$LOG.out"
-run_strace -eget_robust_list,set_robust_list $args > "$OUT"
-match_grep "$LOG" "$OUT"
+run_strace -a24 -eget_robust_list,set_robust_list $args > "$OUT"
+match_diff "$OUT" "$LOG"
 rm -f "$OUT"
 
 exit 0