From d1dfcc533e918307d1f8b75ece1b5fe53fbb8c3b Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 8 Feb 2017 09:28:30 +0000 Subject: [PATCH] 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. --- tests/.gitignore | 4 ++-- tests/Makefile.am | 16 ++++++++-------- ...p.expected => qual_fault-exit_group.expected} | 0 ...xit_group.test => qual_fault-exit_group.test} | 2 +- ...{fault_syntax.test => qual_fault-syntax.test} | 0 tests/{fault_injection.c => qual_fault.c} | 0 tests/{fault_injection.test => qual_fault.test} | 2 +- ...t_injection-retval.c => qual_inject-retval.c} | 0 ...ction-retval.test => qual_inject-retval.test} | 4 ++-- tests/{fault_injection.sh => scno_tampering.sh} | 0 10 files changed, 14 insertions(+), 14 deletions(-) rename tests/{fault_injection-exit_group.expected => qual_fault-exit_group.expected} (100%) rename tests/{fault_injection-exit_group.test => qual_fault-exit_group.test} (98%) rename tests/{fault_syntax.test => qual_fault-syntax.test} (100%) rename tests/{fault_injection.c => qual_fault.c} (100%) rename tests/{fault_injection.test => qual_fault.test} (98%) rename tests/{fault_injection-retval.c => qual_inject-retval.c} (100%) rename tests/{fault_injection-retval.test => qual_inject-retval.test} (76%) rename tests/{fault_injection.sh => scno_tampering.sh} (100%) diff --git a/tests/.gitignore b/tests/.gitignore index f5a6ae0b..644a0721 100644 --- 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 e2ca9871..71576fba 100644 --- 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 25de5b78..c98ffc6e 100755 --- 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 1f562d0c..1d228e50 100755 --- 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 19ece4d7..3d812012 100755 --- 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 -- 2.40.0