tests: (minix) make long options visible for test coverage analysis

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/ts/minix/fsck b/tests/ts/minix/fsck
index f8a8ef4ea7569626439463138c0a4e0cfbbe1d0a..d5512abd1bc7fb2e05c92a5dc52cb4a62d72bfb8 100755 (executable)
--- a/tests/ts/minix/fsck
+++ b/tests/ts/minix/fsck
@@ -33,7 +33,7 @@ mkfs_and_fsck_minix() {
        test $ret = 0 || return $ret
 
        ts_log_both "$ fsck.minix -lavsf image"
-       $TS_CMD_FSCKMINIX -lavsf $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+       $TS_CMD_FSCKMINIX --list --auto --verbose --super --force "$img" >>"$TS_OUTPUT" 2>> "$TS_ERRLOG"
        ret=$?
        echo "return fsck: $ret" >> "$TS_OUTPUT"
        return $ret

diff --git a/tests/ts/minix/fsck-images b/tests/ts/minix/fsck-images
index b836f47890a364f9333e59990e70bcd3542c6e22..b02084c3bb8c01746f20c48b88192ec5e473d1d1 100755 (executable)
--- a/tests/ts/minix/fsck-images
+++ b/tests/ts/minix/fsck-images
@@ -71,14 +71,14 @@ fi
 ts_init_subtest "auto-fix"
 img=${TS_OUTPUT}.img
 cp "$TS_SELF/broken-root" $img
-$TS_CMD_FSCKMINIX -sav $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_FSCKMINIX --super --auto --verbose $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 echo "fsck reports changed and uncorrected: $?" >> "$TS_OUTPUT"
 $TS_CMD_HEXDUMP -C $img >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 sed -i 's/Filesystem on .* is dirty/Filesystem auto-fix is dirty/' "$TS_OUTPUT" "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "bug.773892"
-"$TS_CMD_FSCKMINIX" -f "$TS_SELF/debian.bug.773892" 2>&1 >/dev/null
+"$TS_CMD_FSCKMINIX" --force "$TS_SELF/debian.bug.773892" >/dev/null 2>&1
 echo "fsck reports uncorrected: $?" >> "$TS_OUTPUT"
 ts_finalize_subtest
 

diff --git a/tools/testcoverage.sh b/tools/testcoverage.sh
index 77bc30ae4605472ecd42a443bcce2a24ddd17ca0..c97637982062f49ac9dce22062856e6d7e0ce6cf 100755 (executable)
--- a/tools/testcoverage.sh
+++ b/tools/testcoverage.sh
@@ -68,6 +68,8 @@ ignore_programs=""
 declare -A real_prog_ts_dir=(
        [fsck.cramfs]="cramfs"
        [mkfs.cramfs]="cramfs"
+       [fsck.minix]="minix"
+       [mkfs.minix]="minix"
 )
 
 # Each program has a dedicated subdirectory with test scripts