tests: rewrite umovestr2.test without using grep

The regular expression generated by umovestr2.c on systems with large
page size is too big for GNU grep.  Rewrite the test to use diff
instead of grep.

* tests/umovestr2.test: Use match_diff instead of match_grep.
* tests/umovestr2.c (main): Convert output from regexp to plain text.

diff --git a/tests/umovestr2.c b/tests/umovestr2.c
index a1ca9fd14ff819ccc3213409f783e50127e87407..c7bd42f9b0215214e4e4a1804fb97ed22544cfa8 100644 (file)
--- a/tests/umovestr2.c
+++ b/tests/umovestr2.c
@@ -23,8 +23,9 @@ main(void)
        char *envp[] = { addr, NULL };
        execve("", argv, envp);
 
-       printf("execve\\(\"\", \\[\\], \\[\"%0*u\"\\]\\) = -1 .*\n",
+       printf("execve(\"\", [], [\"%0*u\"]) = -1 ENOENT (No such file or directory)\n",
               (int) tail_len - 1, 0);
+       puts("+++ exited with 0 +++");
 
        return 0;
 }

diff --git a/tests/umovestr2.test b/tests/umovestr2.test
index 705893878dee18d14c43f0632b30704f5d385f76..2e9fee44a77f8d5b704f1e34331454a01b5de7e8 100755 (executable)
--- a/tests/umovestr2.test
+++ b/tests/umovestr2.test
@@ -5,11 +5,14 @@
 . "${srcdir=.}/init.sh"
 
 OUT="$LOG.out"
+EXP="$LOG.exp"
 
 run_prog > /dev/null
-run_strace -veexecve -s262144 $args > "$OUT"
-match_grep "$LOG" "$OUT"
+run_strace -veexecve -s262144 $args > "$EXP"
+check_prog sed
+sed 1d < "$LOG" > "$OUT"
+match_diff "$OUT" "$EXP"
 
-rm -f "$OUT"
+rm -f "$EXP" "$OUT"
 
 exit 0