tests: convert epoll_create1.test from match_grep to match_diff
* tests/epoll_create1.c (main): Print expected output.
* tests/epoll_create1.test: Use match_diff instead of match_grep.
* tests/epoll_create1.expected: Remove.
* tests/Makefile.am (EXTRA_DIST): Remove epoll_create1.expected.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 62d0e56..33a975d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -307,7 +307,6 @@
EXTRA_DIST = init.sh run.sh match.awk \
caps.awk \
dumpio.expected \
- epoll_create1.expected \
eventfd.expected \
execve.expected \
execve-v.expected \
diff --git a/tests/epoll_create1.c b/tests/epoll_create1.c
index 79196a4..4d2e107 100644
--- a/tests/epoll_create1.c
+++ b/tests/epoll_create1.c
@@ -28,6 +28,7 @@
#include "tests.h"
#include <assert.h>
#include <fcntl.h>
+#include <stdio.h>
#include <unistd.h>
#include <sys/syscall.h>
@@ -37,9 +38,15 @@
main(void)
{
(void) close(0);
+
if (syscall(__NR_epoll_create1, O_CLOEXEC))
perror_msg_and_skip("epoll_create1 O_CLOEXEC");
+ puts("epoll_create1(EPOLL_CLOEXEC) = 0");
+
assert(syscall(__NR_epoll_create1, O_CLOEXEC | O_NONBLOCK) == -1);
+ printf("epoll_create1(EPOLL_CLOEXEC|%#x) = -1 EINVAL (%m)\n", O_NONBLOCK);
+
+ puts("+++ exited with 0 +++");
return 0;
}
diff --git a/tests/epoll_create1.expected b/tests/epoll_create1.expected
deleted file mode 100644
index 0e82f61..0000000
--- a/tests/epoll_create1.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-epoll_create1\(EPOLL_CLOEXEC\) += 0
-epoll_create1\(EPOLL_CLOEXEC\|0x[[:xdigit:]]+\) += -1 EINVAL .*
diff --git a/tests/epoll_create1.test b/tests/epoll_create1.test
index fa93a2b..71ac29a 100755
--- a/tests/epoll_create1.test
+++ b/tests/epoll_create1.test
@@ -4,8 +4,10 @@
. "${srcdir=.}/init.sh"
-run_prog
-run_strace -e epoll_create1 $args
-match_grep
+run_prog > /dev/null
+OUT="$LOG.out"
+run_strace -a28 -eepoll_create1 $args > "$OUT"
+match_diff "$LOG" "$OUT"
+rm -f "$OUT"
exit 0
