From f14a8e16654cdf5afecb409f3354657bbd5602ce Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Wed, 26 Aug 2015 23:25:06 +0000
Subject: [PATCH] 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.
---
 tests/sendfile.c           | 17 +++++++++--------
 tests/sendfile.test        |  4 ++--
 tests/sendfile64.c         | 16 +++++++++-------
 tests/sendfile64.test      |  4 ++--
 tests/time.c               |  3 ++-
 tests/time.test            |  4 ++--
 tests/utime.c              |  5 +++--
 tests/utime.test           |  2 +-
 tests/xet_robust_list.c    |  7 ++++---
 tests/xet_robust_list.test |  4 ++--
 10 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/tests/sendfile.c b/tests/sendfile.c
index 6f71a5b0..a03f0902 100644
--- 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 23aacac7..0b592a2c 100755
--- 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 d52fbadb..a37d61b2 100644
--- 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 a50bb885..c8eb73b0 100755
--- 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 2726b2d0..7a9d353d 100644
--- 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 90b1bfb6..c004bd7b 100755
--- 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 0298b27f..c1af785b 100644
--- 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 2ebd4b93..7d416a79 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_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 ddcdd505..fbe903a3 100644
--- 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 9568c1d1..b3c6db76 100755
--- 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
-- 
2.40.0