tests: generalize scripts that check non-abbreviated decoding of ioctls

* tests/ioctl-v.sh: New file.
* tests/Makefile.am (EXTRA_DIST): Add it.
(DECODER_TESTS): Remove ioctl_evdev-v.test, ioctl_loop-v.test,
and ioctl_rtc-v.test.
* tests/gen_tests.in (ioctl_evdev-v, ioctl_loop-v, ioctl_rtc-v):
New entries.
* tests/ioctl_evdev-v.test: Remove.
* tests/ioctl_loop-v.test: Ditto.
* tests/ioctl_rtc-v.test: Ditto.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d4af4d9675b8a564e1dce8b31b37ea85283e33e..1fb67f77ce83f80654c12ebf16171d3958cdffb4 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -502,10 +502,7 @@ DECODER_TESTS = \
        ioctl.test \
        ioctl_dm-v.test \
        ioctl_dm.test \
-       ioctl_evdev-v.test \
        ioctl_loop-nv.test \
-       ioctl_loop-v.test \
-       ioctl_rtc-v.test \
        ioctl_sock_gifconf.test \
        ipc_msgbuf.test \
        llseek.test \
@@ -621,6 +618,7 @@ EXTRA_DIST = gen_tests.in gen_tests.sh init.sh run.sh match.awk \
             fstatx.c \
             getresugid.c \
             init_delete_module.h \
+            ioctl-v.sh \
             ipc.sh \
             ipc_msgbuf.expected \
             ksysent.sed \

diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index 0e95b4e30725c2f12de0e0de8a877fbf2171e23f..e163b5ca859fccf1985c82b2a741b8f840c3c92f 100644 (file)
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -117,9 +117,12 @@ inotify_init1      -a27
 int_0x80       -a11 -e trace=getgid32
 ioctl_block    +ioctl.test
 ioctl_evdev    +ioctl.test
+ioctl_evdev-v  +ioctl-v.sh
 ioctl_loop     +ioctl.test
+ioctl_loop-v   +ioctl-v.sh
 ioctl_mtd      +ioctl.test
 ioctl_rtc      +ioctl.test
+ioctl_rtc-v    +ioctl-v.sh
 ioctl_scsi     +ioctl.test
 ioctl_sg_io_v3 +ioctl.test
 ioctl_sg_io_v4 +ioctl.test

diff --git a/tests/ioctl_evdev-v.test b/tests/ioctl-v.sh
similarity index 62%
rename from tests/ioctl_evdev-v.test
rename to tests/ioctl-v.sh
index 52373ce72e7c4ccaea94f5bf2e6121ce784393d1..be89671263dd1e5d8db58c80baf6007b702f53d9 100755 (executable)
--- a/tests/ioctl_evdev-v.test
+++ b/tests/ioctl-v.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Check verbose decoding EVIOC* ioctls.
+# Check non-abbreviated decoding of ioctls.
 
 . "${srcdir=.}/init.sh"
 
 check_prog grep
 run_prog > /dev/null
-run_strace -a16 -veioctl $args > "$EXP"
+run_strace -a16 -v -eioctl $args > "$EXP"
 grep -v '^ioctl([012],' < "$LOG" > "$OUT"
 match_diff "$OUT" "$EXP"

diff --git a/tests/ioctl_loop-v.test b/tests/ioctl_loop-v.test
deleted file mode 100755 (executable)
index 0fb224f..0000000
--- a/tests/ioctl_loop-v.test
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Check non-abbreviated decoding of LOOP_* ioctls.
-
-. "${srcdir=.}/init.sh"
-
-check_prog grep
-run_prog > /dev/null
-run_strace -a22 -v -eioctl $args > "$EXP"
-grep -v '^ioctl([012],' < "$LOG" > "$OUT"
-match_diff "$OUT" "$EXP"

diff --git a/tests/ioctl_rtc-v.test b/tests/ioctl_rtc-v.test
deleted file mode 100755 (executable)
index cbb4ede..0000000
--- a/tests/ioctl_rtc-v.test
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# Check verbose decoding of RTC_* ioctls.
-
-. "${srcdir=.}/init.sh"
-
-check_prog grep
-run_prog > /dev/null
-run_strace -a16 -veioctl $args > "$EXP"
-grep -v '^ioctl([012],' < "$LOG" > "$OUT"
-match_diff "$OUT" "$EXP"