fanotify_mark.test: rewrite from match_grep to match_diff

* tests/fanotify_mark.c (main): Print expected output.
* tests/fanotify_mark.test: Use run_strace_match_diff.
* tests/fanotify_mark.expected: Remove.
* tests/Makefile.am (EXTRA_DIST): Remove it.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 69dd16a3d035da490156654cd931b074c20b06f7..e8ea059fc47a36736986b821d6f2a2fad3995bfe 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -728,7 +728,6 @@ EXTRA_DIST = init.sh run.sh match.awk \
             caps.awk \
             count-f.expected \
             eventfd.expected \
-            fanotify_mark.expected \
             filter-unavailable.expected \
             fstatat.c \
             fstatx.c \

diff --git a/tests/fanotify_mark.c b/tests/fanotify_mark.c
index e467bf00ef500df70b13e9492f2edc729030dd7c..9cac5ef7ba54f86905f7c4582fdaf9d79700fbf5 100644 (file)
--- a/tests/fanotify_mark.c
+++ b/tests/fanotify_mark.c
@@ -2,12 +2,18 @@
 
 #if defined HAVE_SYS_FANOTIFY_H && defined HAVE_FANOTIFY_MARK
 
+# include <stdio.h>
 # include <sys/fanotify.h>
 
 int
 main(void)
 {
-       fanotify_mark(-1, FAN_MARK_ADD, FAN_MODIFY | FAN_ONDIR, -100, ".");
+       int rc = fanotify_mark(-1, FAN_MARK_ADD, FAN_MODIFY | FAN_ONDIR,
+                              -100, ".");
+       printf("fanotify_mark(-1, FAN_MARK_ADD, FAN_MODIFY|FAN_ONDIR"
+              ", AT_FDCWD, \".\") = %d %s (%m)\n", rc, errno2name());
+
+       puts("+++ exited with 0 +++");
        return 0;
 }
 

diff --git a/tests/fanotify_mark.expected b/tests/fanotify_mark.expected
deleted file mode 100644 (file)
index d2bb336..0000000
--- a/tests/fanotify_mark.expected
+++ /dev/null
@@ -1 +0,0 @@
-fanotify_mark\(-1, FAN_MARK_ADD, FAN_MODIFY\|FAN_ONDIR, AT_FDCWD, "\."\) += -1.*

diff --git a/tests/fanotify_mark.test b/tests/fanotify_mark.test
index 4b7749afa31fa193325b72e1637307c5a2d033b9..84b3c83eccdbfb7fd623b783283bcc1d9da4f41c 100755 (executable)
--- a/tests/fanotify_mark.test
+++ b/tests/fanotify_mark.test
@@ -1,11 +1,6 @@
 #!/bin/sh
 
-# Check fanotify_mark syscall decoding.
+# Check decoding of fanotify_mark syscall.
 
 . "${srcdir=.}/init.sh"
-
-run_prog
-run_strace -efanotify_mark $args
-match_grep
-
-exit 0
+run_strace_match_diff