tests: prepare for introduction of -e inject= option

Rename files related to fault injection to avoid further confusion.

* tests/fault_injection-exit_group.expected: Rename
to tests/qual_fault-exit_group.expected.
* tests/fault_injection-exit_group.test: Rename
to tests/qual_fault-exit_group.test.
* tests/fault_syntax.test: Rename to tests/qual_fault-syntax.test.
* tests/fault_injection.c: Rename to tests/qual_fault.c.
* tests/fault_injection.test: Rename to tests/qual_fault.test.
* tests/fault_injection-retval.c: Rename to tests/qual_inject-retval.c.
* tests/fault_injection-retval.test: Rename
to tests/qual_inject-retval.test.
* tests/fault_injection.sh: Rename to tests/scno_tampering.sh.
* tests/.gitignore: Update.
* tests/Makefile.am (check_PROGRAMS, DECODER_TESTS, MISC_TESTS,
EXTRA_DIST): Update.

diff --git a/tests/.gitignore b/tests/.gitignore
index f5a6ae0b89a390f4aaa4969f8287daac1d1ac7bf..644a0721e3e05642b56c3e0a6e9672ac75617726 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -55,8 +55,6 @@ fadvise64_64
 fallocate
 fanotify_init
 fanotify_mark
-fault_injection
-fault_injection-retval
 fchdir
 fchmod
 fchmodat
@@ -240,6 +238,8 @@ process_vm_writev
 pselect6
 ptrace
 pwritev
+qual_fault
+qual_inject-retval
 qual_signal
 quotactl
 quotactl-v

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e2ca9871480c7a8fa7070e1545b2021c03bae369..71576fba00a76e1a1ff4b6e6ed9b9a959f4bba28 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -116,8 +116,6 @@ check_PROGRAMS = \
        fallocate \
        fanotify_init \
        fanotify_mark \
-       fault_injection \
-       fault_injection-retval \
        fchdir \
        fchmod \
        fchmodat \
@@ -299,6 +297,8 @@ check_PROGRAMS = \
        pselect6 \
        ptrace \
        pwritev \
+       qual_fault \
+       qual_inject-retval \
        qual_signal \
        quotactl \
        quotactl-v \
@@ -522,7 +522,6 @@ DECODER_TESTS = \
        fallocate.test \
        fanotify_init.test \
        fanotify_mark.test \
-       fault_injection-exit_group.test \
        fchdir.test \
        fchmod.test \
        fchmodat.test \
@@ -696,6 +695,7 @@ DECODER_TESTS = \
        pselect6.test \
        ptrace.test \
        pwritev.test \
+       qual_fault-exit_group.test \
        quotactl-v.test \
        quotactl-xfs-v.test \
        quotactl-xfs.test \
@@ -837,15 +837,15 @@ MISC_TESTS = \
        detach-running.test \
        detach-sleeping.test \
        detach-stopped.test \
-       fault_injection-retval.test \
-       fault_injection.test \
-       fault_syntax.test \
        filter-unavailable.test \
        fork-f.test \
        ksysent.test \
        opipe.test \
        options-syntax.test \
        pc.test \
+       qual_fault-syntax.test \
+       qual_fault.test \
+       qual_inject-retval.test \
        qual_signal.test \
        qual_syscall.test \
        redirect-fds.test \
@@ -886,8 +886,6 @@ EXTRA_DIST = init.sh run.sh match.awk \
             count-f.expected \
             eventfd.expected \
             fadvise.h \
-            fault_injection-exit_group.expected \
-            fault_injection.sh \
             filter-unavailable.expected \
             fstatat.c \
             fstatx.c \
@@ -904,7 +902,9 @@ EXTRA_DIST = init.sh run.sh match.awk \
             ppoll-v.expected \
             ppoll.expected \
             process_vm_readv_writev.c \
+            qual_fault-exit_group.expected \
             quotactl.h \
+            scno_tampering.sh \
             setfsugid.c \
             setresugid.c \
             setreugid.c \

diff --git a/tests/fault_injection-exit_group.expected b/tests/qual_fault-exit_group.expected
similarity index 100%
rename from tests/fault_injection-exit_group.expected
rename to tests/qual_fault-exit_group.expected

diff --git a/tests/fault_injection-exit_group.test b/tests/qual_fault-exit_group.test
similarity index 98%
rename from tests/fault_injection-exit_group.test
rename to tests/qual_fault-exit_group.test
index 25de5b78371851b027283e0478b438ff3b830a01..c98ffc6e02d7961301fbb5bbae70ccafa9803664 100755 (executable)
--- a/tests/fault_injection-exit_group.test
+++ b/tests/qual_fault-exit_group.test
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-. "${srcdir=.}/fault_injection.sh"
+. "${srcdir=.}/scno_tampering.sh"
 
 test_with()
 {

diff --git a/tests/fault_syntax.test b/tests/qual_fault-syntax.test
similarity index 100%
rename from tests/fault_syntax.test
rename to tests/qual_fault-syntax.test

diff --git a/tests/fault_injection.c b/tests/qual_fault.c
similarity index 100%
rename from tests/fault_injection.c
rename to tests/qual_fault.c

diff --git a/tests/fault_injection.test b/tests/qual_fault.test
similarity index 98%
rename from tests/fault_injection.test
rename to tests/qual_fault.test
index 1f562d0c75887a9d4cb0631ecccd2604ad1e2c60..1d228e50a28928f93332711c85e1862f15bf5225 100755 (executable)
--- a/tests/fault_injection.test
+++ b/tests/qual_fault.test
@@ -27,7 +27,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-. "${srcdir=.}/fault_injection.sh"
+. "${srcdir=.}/scno_tampering.sh"
 
 #
 # F

diff --git a/tests/fault_injection-retval.c b/tests/qual_inject-retval.c
similarity index 100%
rename from tests/fault_injection-retval.c
rename to tests/qual_inject-retval.c

diff --git a/tests/fault_injection-retval.test b/tests/qual_inject-retval.test
similarity index 76%
rename from tests/fault_injection-retval.test
rename to tests/qual_inject-retval.test
index 19ece4d7a209b4802a4c2ce7b09031cce77fa7ac..3d812012e8e1aa9372a588ae4209456f7e762d0a 100755 (executable)
--- a/tests/fault_injection-retval.test
+++ b/tests/qual_inject-retval.test
@@ -2,7 +2,7 @@
 
 # Check success injection.
 
-. "${srcdir=.}/fault_injection.sh"
+. "${srcdir=.}/scno_tampering.sh"
 
 check_injection()
 {
@@ -12,7 +12,7 @@ check_injection()
        rval="$1"; shift
 
        run_strace -a12 -e$syscall -efault="$syscall:retval=$rval" "$@" \
-               ./fault_injection-retval "$rval" > "$EXP"
+               ./qual_inject-retval "$rval" > "$EXP"
        match_diff "$LOG" "$EXP"
        rm -f "$EXP"
 }

diff --git a/tests/fault_injection.sh b/tests/scno_tampering.sh
similarity index 100%
rename from tests/fault_injection.sh
rename to tests/scno_tampering.sh