From c3529547861adad93a548ee26cb9219c29e4cd2c Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Wed, 5 Apr 2017 00:44:30 +0000
Subject: [PATCH] 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.
---
 tests/Makefile.am                        |  4 +---
 tests/gen_tests.in                       |  3 +++
 tests/{ioctl_evdev-v.test => ioctl-v.sh} |  4 ++--
 tests/ioctl_loop-v.test                  | 11 -----------
 tests/ioctl_rtc-v.test                   | 11 -----------
 5 files changed, 6 insertions(+), 27 deletions(-)
 rename tests/{ioctl_evdev-v.test => ioctl-v.sh} (62%)
 delete mode 100755 tests/ioctl_loop-v.test
 delete mode 100755 tests/ioctl_rtc-v.test

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5d4af4d9..1fb67f77 100644
--- 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 0e95b4e3..e163b5ca 100644
--- 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 52373ce7..be896712 100755
--- 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
index 0fb224f6..00000000
--- 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
index cbb4ede4..00000000
--- 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"