tests: implement ioctl_evdev-success-v.test via ioctl_evdev-success.test

* tests/ioctl_evdev-success-v.test: Remove.
* tests/Makefile.am (DECODER_TESTS): Remove ioctl_evdev-success-v.test.
* tests/gen_tests.in: Add ioctl_evdev-success-v as a wrapper for
ioctl_evdev-success.test.
* tests/ioctl_evdev-success.test: Save "$args" to $prog, increase -a
parameter value to 26 columns, inject "$@" into run_strace arguments,
call $prog instead of axplicit program name.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b89c4b03e2aa7070d535114c11f98b1549c70727..0f782b8f2fbd986ae586e4d3e57a9ff802199bed 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -249,7 +249,6 @@ DECODER_TESTS = \
        int_0x80.test \
        inotify_init-y.test \
        ioctl.test \
-       ioctl_evdev-success-v.test \
        ioctl_evdev-success.test \
        ioctl_perf-success.test \
        ipc_msgbuf.test \

diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index 2b54d9a3c370af4f2f4607687c802195577b07e8..ce263098000d3dd2e7b5263ec5d88153bb61e36c 100644 (file)
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -141,6 +141,7 @@ ioctl_dm    +ioctl.test -s9
 ioctl_dm-v     +ioctl.test -v -s9
 ioctl_evdev    +ioctl.test
 ioctl_evdev-v  +ioctl.test -v
+ioctl_evdev-success-v  +ioctl_evdev-success.test -a26 -v
 ioctl_inotify  +ioctl.test
 ioctl_kvm_run  +ioctl.test -a36 -y
 ioctl_kvm_run-v        +ioctl.test -v -a36 -y

diff --git a/tests/ioctl_evdev-success-v.test b/tests/ioctl_evdev-success-v.test
deleted file mode 100755 (executable)
index 9932358..0000000
--- a/tests/ioctl_evdev-success-v.test
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh -efu
-#
-# Copyright (c) 2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-. "${srcdir=.}/scno_tampering.sh"
-
-: ${IOCTL_INJECT_START=256}
-
-run_prog
-
-for ret in 0 2 8 15 16; do
-       run_strace -a16 -v -e trace=ioctl \
-               -e inject=ioctl:retval="${ret}":when="${IOCTL_INJECT_START}+" \
-               ../ioctl_evdev-success-v \
-               "${IOCTL_INJECT_START}" "${ret}"> "$EXP.$ret"
-       grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT.$ret"
-       match_diff "$OUT.$ret" "$EXP.$ret"
-done

diff --git a/tests/ioctl_evdev-success.test b/tests/ioctl_evdev-success.test
index 8e191014482019fb15712c0bf4180a10941659ea..164a6126d1d34aa1cea386d7a209265a3db2492a 100755 (executable)
--- a/tests/ioctl_evdev-success.test
+++ b/tests/ioctl_evdev-success.test
@@ -10,11 +10,12 @@
 : ${IOCTL_INJECT_START=256}
 
 run_prog
+prog="$args"
 
 for ret in 0 2 8 15 16; do
-       run_strace -a16 -e trace=ioctl \
+       run_strace -a26 "$@" -e trace=ioctl \
                -e inject=ioctl:retval="${ret}":when="${IOCTL_INJECT_START}+" \
-               ../ioctl_evdev-success \
+               "$prog" \
                "${IOCTL_INJECT_START}" "${ret}"> "$EXP.${ret}"
        grep -v '^ioctl([012][,<]' < "$LOG" > "$OUT.$ret"
        match_diff "$OUT.$ret" "$EXP.$ret"