tests: clean up $DEBUGFS_EXE usage in scripts

Instead of putting the entire test script under an implicit
"if test -x $DEBUGFS_EXE" conditional (sometimes indenting
the code, and sometimes not), rather check for the reverse
and exit the test script early if $DEBUGFS_EXE is missing.

In some places, tests were running $DEBUGFS_EXE directly,
when they should be running $DEBUGFS (which will run with
Fortify, or other options).

[ Fixed up missing exit statement in f_detect_junk. --tytso ]

Signed-off-by: Andreas Dilger <adilger@dilger.ca>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/tests/d_dumpe2fs_group_only/script b/tests/d_dumpe2fs_group_only/script
index 50481f02705421a5554e2fa5d2a88dd95681c450..c3ab7e2bc8fc4df02c4918d5c17b36b43ea3fa73 100644 (file)
--- a/tests/d_dumpe2fs_group_only/script
+++ b/tests/d_dumpe2fs_group_only/script
@@ -4,7 +4,10 @@ if [ $(uname -s) = "Darwin" ]; then
        return 0
 fi
 
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -43,7 +46,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/d_fallocate/script b/tests/d_fallocate/script
index b3982a3d8e3a88c67be615053bb12775458c85f1..b41eaafe778792ae7ad55e07d1c50c1d4f288ed5 100644 (file)
--- a/tests/d_fallocate/script
+++ b/tests/d_fallocate/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -143,8 +146,8 @@ sif /k size 9216000
 ENDL
 echo "ex /k" >> $TMPFILE.cmd2
 
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
-$DEBUGFS_EXE -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
+$DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
@@ -169,7 +172,3 @@ fi
 rm -f $EXP
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/d_fallocate_bigalloc/script b/tests/d_fallocate_bigalloc/script
index 9022a2ba1f282cfed31b3b91db049eaa31dd5af6..9c8fde89a4acb8eeb45d5059ae6843e6f85f8c57 100644 (file)
--- a/tests/d_fallocate_bigalloc/script
+++ b/tests/d_fallocate_bigalloc/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -144,8 +147,8 @@ sif /k size 9216000
 ENDL
 echo "ex /k" >> $TMPFILE.cmd2
 
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
-$DEBUGFS_EXE -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
+$DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
@@ -170,7 +173,3 @@ fi
 rm -f $EXP
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/d_fallocate_blkmap/script b/tests/d_fallocate_blkmap/script
index 9c48cbc90ef4edf0fd3fa6fd3975b6881633bd60..86d1deee37a3b0971261ed53ff1c40605cdebb10 100644 (file)
--- a/tests/d_fallocate_blkmap/script
+++ b/tests/d_fallocate_blkmap/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -53,8 +56,8 @@ ENDL
 echo "stat /a" >> $TMPFILE.cmd2
 echo "stat /b" >> $TMPFILE.cmd2
 
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
-$DEBUGFS_EXE -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
+$DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
 sed -f $cmd_dir/filter.sed -e '/^.*time:.*$/d' < $OUT.new >> $OUT
 rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
@@ -79,7 +82,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/d_inline_dump/script b/tests/d_inline_dump/script
index 6df34b62b65ebb7e21152d4cdd34a4cfec386e44..3193f78f11fbeb29b543c88696f8fb7fbea0881b 100644 (file)
--- a/tests/d_inline_dump/script
+++ b/tests/d_inline_dump/script
@@ -1,42 +1,43 @@
 if ! test -x $DEBUGFS_EXE; then
-   echo "$test_name: $test_description: skipped"
-else
-    OUT=$test_name.log
-    EXP=$test_dir/expect
-    VERIFY_FSCK_OPT=-yf
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
+
+OUT=$test_name.log
+EXP=$test_dir/expect
+VERIFY_FSCK_OPT=-yf
 
-    ZIMAGE=$test_dir/image.gz
-    gzip -d < $ZIMAGE > $TMPFILE
+ZIMAGE=$test_dir/image.gz
+gzip -d < $ZIMAGE > $TMPFILE
 
-    echo "*** long file" > $OUT
-    $DEBUGFS -R 'stat /file' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
-    echo "*** short file" >> $OUT
-    $DEBUGFS -R 'stat /shortfile' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
-    echo >> $OUT
+echo "*** long file" > $OUT
+$DEBUGFS -R 'stat /file' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
+echo "*** short file" >> $OUT
+$DEBUGFS -R 'stat /shortfile' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
+echo >> $OUT
 
-    echo "*** long dir" >> $OUT
-    $DEBUGFS -R 'stat /dir' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
-    echo "*** short dir" >> $OUT
-    $DEBUGFS -R 'stat /shortdir' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
-    echo >> $OUT
+echo "*** long dir" >> $OUT
+$DEBUGFS -R 'stat /dir' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
+echo "*** short dir" >> $OUT
+$DEBUGFS -R 'stat /shortdir' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
+echo >> $OUT
 
-    echo "*** long link" >> $OUT
-    $DEBUGFS -R 'stat /link' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
-    echo "*** short link" >> $OUT
-    $DEBUGFS -R 'stat /shortlink' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
+echo "*** long link" >> $OUT
+$DEBUGFS -R 'stat /link' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
+echo "*** short link" >> $OUT
+$DEBUGFS -R 'stat /shortlink' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
 
-    echo "*** end test" >> $OUT
+echo "*** end test" >> $OUT
 
-    cmp -s $OUT $EXP
-    status=$?
+cmp -s $OUT $EXP
+status=$?
 
-    if [ "$status" = 0 ] ; then
+if [ "$status" = 0 ] ; then
        echo "$test_name: $test_description: ok"
        touch $test_name.ok
-    else
+else
        echo "$test_name: $test_description: failed"
        diff $DIFF_OPTS $EXP $OUT > $test_name.failed
-    fi
-
-    unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA ZIMAGE
 fi
+
+unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA ZIMAGE

diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script
index 04723f7230cfd9878ef437ddc6e7380ce86312aa..c91a6e94c686608813626753ee79a4ab4ed36abe 100644 (file)
--- a/tests/d_loaddump/script
+++ b/tests/d_loaddump/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 OUT=$test_name.log
 EXP=$test_dir/expect
@@ -47,7 +50,11 @@ echo Exit status is $status >> $OUT
 # Do the verification
 #
 
-rm -f $VERIFY_DATA $TEST_DATA $TMPFILE $OUT.new
+if [ "$SKIP_UNLINK" != "true" ]; then
+       rm -f $VERIFY_DATA $TEST_DATA $TMPFILE $OUT.new
+else
+       echo "TMPFILE=$TMPFILE"
+fi
 cmp -s $OUT $EXP
 status=$?
 
@@ -60,7 +67,3 @@ else
 fi
 
 unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/d_punch/script b/tests/d_punch/script
index 7a77c69ca7b26dfeb16b436678405aac5a888128..5bb51cd60c0d77a07345cd4aac989dae9c20c2ac 100644 (file)
--- a/tests/d_punch/script
+++ b/tests/d_punch/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -97,8 +100,8 @@ punch /f 1 8998
 ENDL
 echo "ex /f" >> $TMPFILE.cmd2
 
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
-$DEBUGFS_EXE -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
+$DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
@@ -123,7 +126,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/d_punch_bigalloc/script b/tests/d_punch_bigalloc/script
index 6eb05711981252609c788e092629b3be8834ee2d..7d0c7fe74f560c57f96f5f278568856574e19a6a 100644 (file)
--- a/tests/d_punch_bigalloc/script
+++ b/tests/d_punch_bigalloc/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -98,8 +101,8 @@ punch /f 1 8998
 ENDL
 echo "ex /f" >> $TMPFILE.cmd2
 
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
-$DEBUGFS_EXE -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > /dev/null 2>&1
+$DEBUGFS -f $TMPFILE.cmd2 $TMPFILE >> $OUT.new 2>&1
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new $TMPFILE.cmd $TMPFILE.cmd2
 
@@ -124,7 +127,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/d_special_files/script b/tests/d_special_files/script
index a8c28582e8bfeb9fbadc03e43d92d835534d0763..746d724b6ca5ce6e458cfab7ff27ba8d27d4ec24 100644 (file)
--- a/tests/d_special_files/script
+++ b/tests/d_special_files/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 OUT=$test_name.log
 EXP=$test_dir/expect
@@ -88,7 +91,3 @@ else
 fi
 
 unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/d_xattr_edits/script b/tests/d_xattr_edits/script
index b6451ee77c27c86d9fd3a325c2804a455f703a54..13550a17d8a83016f3c9e0361598d0599c78ec9e 100644 (file)
--- a/tests/d_xattr_edits/script
+++ b/tests/d_xattr_edits/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 OUT=$test_name.log
 EXP=$test_dir/expect
@@ -135,7 +138,3 @@ else
 fi
 
 unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/d_xattr_sorting/script b/tests/d_xattr_sorting/script
index 9e6e362dd8b48c69af545a922720bef1fa9318a2..a599f3c4d801f40a9afd6fd6166129e26d162967 100644 (file)
--- a/tests/d_xattr_sorting/script
+++ b/tests/d_xattr_sorting/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 OUT=$test_name.log
 EXP=$test_dir/expect
@@ -89,7 +92,3 @@ else
 fi
 
 unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/f_badcluster/script b/tests/f_badcluster/script
index ea9e4889c9e4e924fec348ae9a1afea8ef73a322..0012594acfa0e196eba2bb44a7819e825b4014bb 100644 (file)
--- a/tests/f_badcluster/script
+++ b/tests/f_badcluster/script
@@ -1,27 +1,28 @@
-if test -x $DEBUGFS_EXE; then
-       IMAGE=$test_dir/../f_badcluster/image.gz
-       OUT=$test_name.log
-       EXP=$test_dir/expect
-       gzip -d < $IMAGE > $TMPFILE
-       $FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $OUT
-       $FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-       $FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-       for i in a b c d e f g; do echo "stat /$i"; done > $TMPFILE.tmp
-       echo "quit" >> $TMPFILE.tmp
-       $DEBUGFS_EXE -f $TMPFILE.tmp $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
-       rm -f $TMPFILE.tmp
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
+
+IMAGE=$test_dir/../f_badcluster/image.gz
+OUT=$test_name.log
+EXP=$test_dir/expect
+gzip -d < $IMAGE > $TMPFILE
+$FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed > $OUT
+$FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$FSCK -fy $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+for i in a b c d e f g; do echo "stat /$i"; done > $TMPFILE.tmp
+echo "quit" >> $TMPFILE.tmp
+$DEBUGFS -f $TMPFILE.tmp $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+rm -f $TMPFILE.tmp
 
-       cmp -s $OUT $EXP
-       status=$?
+cmp -s $OUT $EXP
+status=$?
 
-       if [ "$status" = 0 ]; then
-               echo "$test_name: $test_description: ok"
-               touch $test_name.ok
-       else
-               echo "$test_name: $test_description: failed"
-               diff $DIFF_OPTS $EXP $OUT > $test_name.failed
-               rm -f $test_name.tmp
-       fi
+if [ "$status" = 0 ]; then
+       echo "$test_name: $test_description: ok"
+       touch $test_name.ok
 else
-       echo "$test_name: skipped"
+       echo "$test_name: $test_description: failed"
+       diff $DIFF_OPTS $EXP $OUT > $test_name.failed
+       rm -f $test_name.tmp
 fi

diff --git a/tests/f_bigalloc_badinode/script b/tests/f_bigalloc_badinode/script
index e58910f29f5251ca153ada61a41fb2d9023015ee..c1dd45461dda708b04a13bb7e0ada6e7d297bb02 100644 (file)
--- a/tests/f_bigalloc_badinode/script
+++ b/tests/f_bigalloc_badinode/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 SKIP_GUNZIP="true"
 TEST_DATA="$test_name.tmp"
@@ -18,7 +21,3 @@ EOF
 rm -f $TEST_DATA
 
 unset E2FSCK_TIME TEST_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/f_bigalloc_orphan_list/script b/tests/f_bigalloc_orphan_list/script
index af9d753022ada6bdd7615fbbe5627e3ed52e69a5..63a0350f05d4e18c420cea682a8169a4760c852e 100644 (file)
--- a/tests/f_bigalloc_orphan_list/script
+++ b/tests/f_bigalloc_orphan_list/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 SKIP_GUNZIP="true"
 TEST_DATA="$test_name.tmp"
@@ -22,7 +25,3 @@ EOF
 rm -f $TEST_DATA
 
 unset E2FSCK_TIME TEST_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/f_create_symlinks/script b/tests/f_create_symlinks/script
index 1a97216aadfabdb74818370e2b1059eed66c9320..7d712f5dc0ea408604be5110a4201a292bfcebeb 100644 (file)
--- a/tests/f_create_symlinks/script
+++ b/tests/f_create_symlinks/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-yf
 OUT=$test_name.log
@@ -56,7 +59,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/f_desc_size_bad/script b/tests/f_desc_size_bad/script
index 544032860641d329bc7021c69f69bd8b1be13acf..ae2962770dc81ff197bfd4ebb784a5f7411b750e 100644 (file)
--- a/tests/f_desc_size_bad/script
+++ b/tests/f_desc_size_bad/script
@@ -1,5 +1,5 @@
 if ! test -x $DEBUGFS_EXE; then
-        echo "$test_name: $test_description: skipped"
+       echo "$test_name: $test_description: skipped (no debugfs)"
        return 0
 fi
 

diff --git a/tests/f_detect_junk/script b/tests/f_detect_junk/script
index 429ff00e4d387728c260917119f917e878246e13..12cfdfdff25e285dba00a7d916cdf390afd961d9 100644 (file)
--- a/tests/f_detect_junk/script
+++ b/tests/f_detect_junk/script
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-if [ "$(grep -c 'define HAVE_MAGIC_H' ../lib/config.h)" -gt 0 ]; then
+if [ "$(grep -c 'define HAVE_MAGIC_H' ../lib/config.h)" -eq 0 ]; then
+       echo "$test_name: skipped (no magic)"
+       exit 0
+fi
 
 FSCK_OPT=-fn
 IMAGE=$test_dir/image.bz2
@@ -20,7 +23,7 @@ rm -rf $test_name.failed $test_name.ok
 echo "*** e2fsck" > $OUT
 $FSCK $FSCK_OPT $TMPFILE >> $OUT 2>&1
 echo "*** debugfs" >> $OUT
-test -x $DEBUGFS_EXE && $DEBUGFS_EXE -R 'quit' $TMPFILE >> $OUT 2>&1
+test -x $DEBUGFS_EXE && $DEBUGFS -R 'quit' $TMPFILE >> $OUT 2>&1
 echo "*** tune2fs" >> $OUT
 $TUNE2FS -i 0 $TMPFILE >> $OUT 2>&1
 echo "*** mke2fs" >> $OUT
@@ -38,7 +41,3 @@ else
        diff -u $EXP $OUT >> $test_name.failed
 fi
 unset EXP OUT FSCK_OPT IMAGE
-
-else #if HAVE_MAGIC_H
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/f_detect_xfs/script b/tests/f_detect_xfs/script
index c80f0f7ec5ae0739a930ad757ec02f6d12db469f..4da1cd9d7d883858e939597dd6feae017bcf2c5d 100644 (file)
--- a/tests/f_detect_xfs/script
+++ b/tests/f_detect_xfs/script
@@ -17,7 +17,7 @@ rm -rf $test_name.failed $test_name.ok
 echo "*** e2fsck" > $OUT
 $FSCK $FSCK_OPT $TMPFILE >> $OUT 2>&1
 echo "*** debugfs" >> $OUT
-test -x $DEBUGFS_EXE && $DEBUGFS_EXE -R 'quit' $TMPFILE >> $OUT 2>&1
+test -x $DEBUGFS_EXE && $DEBUGFS -R 'quit' $TMPFILE >> $OUT 2>&1
 echo "*** tune2fs" >> $OUT
 $TUNE2FS -i 0 $TMPFILE >> $OUT 2>&1
 echo "*** mke2fs" >> $OUT

diff --git a/tests/f_dup4/script b/tests/f_dup4/script
index 498f5259c388355bb56c800c64500b94626644ae..aec862d1fd79aa5746ee28e5c01786b06028486c 100644 (file)
--- a/tests/f_dup4/script
+++ b/tests/f_dup4/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 SKIP_GUNZIP="true"
 TEST_DATA="$test_name.tmp"
@@ -50,7 +53,3 @@ export E2FSCK_TIME
 rm -f $TEST_DATA
 
 unset E2FSCK_TIME TEST_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/f_dup_de/script b/tests/f_dup_de/script
index 60378cdc94b8a667f7d4b47bda216caf6ca85bc8..dcda9d805fbeb5e2d3035dc52c42830d2d2e77a1 100644 (file)
--- a/tests/f_dup_de/script
+++ b/tests/f_dup_de/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 if test "$HTREE"x = x ; then
        gunzip < $test_dir/image.gz > $TMPFILE
@@ -10,7 +13,3 @@ if test "$HTREE"x = x ; then
 fi
 . $cmd_dir/run_e2fsck
 rm -f "$TMPFILE".gz
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/f_dup_resize/script b/tests/f_dup_resize/script
index 19fa120fc5805d6addd306763e4039fb37f876da..52a1aed7ea9dc1ab2dc5f8a0b3f8f97d38d80e09 100644 (file)
--- a/tests/f_dup_resize/script
+++ b/tests/f_dup_resize/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 SKIP_GUNZIP="true"
 TEST_DATA="$test_name.tmp"
@@ -24,7 +27,3 @@ export E2FSCK_TIME
 rm -f $TEST_DATA
 
 unset E2FSCK_TIME TEST_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/f_extent_oobounds/script b/tests/f_extent_oobounds/script
index 54674cae2daebc8f9074c1fa60dda5e3747236ae..9c6117c082a1d487862edb4f47a0f61e7710c445 100644 (file)
--- a/tests/f_extent_oobounds/script
+++ b/tests/f_extent_oobounds/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 SKIP_GUNZIP="true"
 TEST_DATA="$test_name.tmp"
@@ -36,7 +39,3 @@ EOF
 rm -f $TEST_DATA
 
 unset E2FSCK_TIME TEST_DATA
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/f_imagic_fs/script b/tests/f_imagic_fs/script
index 1060f04d1eb350c0b5f9a711608522ad5e2ce3a3..511dcc7692595088f1498698fa871f721a533576 100644 (file)
--- a/tests/f_imagic_fs/script
+++ b/tests/f_imagic_fs/script
@@ -1,9 +1,8 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/../f_imagic/image.gz
 PREP_CMD='$DEBUGFS -w -R "feature imagic_inodes" $TMPFILE > /dev/null 2>&1'
 . $cmd_dir/run_e2fsck
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/f_resize_inode/script b/tests/f_resize_inode/script
index 190871b47a46c2825de99eeb95cd4bae94cfa144..0243bdac3ba5324e301fcfdc5e65f3656d82d43a 100644 (file)
--- a/tests/f_resize_inode/script
+++ b/tests/f_resize_inode/script
@@ -1,6 +1,9 @@
-if test -x $DEBUGFS_EXE; then
-
 test_description="e2fsck with resize_inode"
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
+
 FSCK_OPT=-yf
 OUT=$test_name.log
 if [ -f $test_dir/expect.gz ]; then
@@ -137,7 +140,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/f_uninit_cat/script b/tests/f_uninit_cat/script
index 8877566022e879e42d977d7dae5d7b9872653566..8d56e849648705ce44b92923fbcd807ff2e4c07d 100755 (executable)
--- a/tests/f_uninit_cat/script
+++ b/tests/f_uninit_cat/script
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 FSCK_OPT=-fy
 IMAGE=$test_dir/image.gz
 
@@ -18,7 +21,7 @@ echo "Exit status is $?" >> $OUT
 echo "debugfs cat uninit file" >> $OUT
 echo "ex /a" > $TMPFILE.cmd
 echo "cat /a" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE >> $OUT.new 2>&1
 echo >> $OUT.new
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new $TMPFILE $TMPFILE.cmd
@@ -32,6 +35,3 @@ else
        diff -u $EXP $OUT >> $test_name.failed
 fi
 unset EXP OUT FSCK_OPT IMAGE
-else #if test -a -x $DEBUGFS_EXE; then
-        echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/f_uninit_last_uninit/script b/tests/f_uninit_last_uninit/script
index 376c97823d59d8fa1fe2a825116b781abdbf50be..53105a417fe748ccc612113153c285049c0a3f1f 100644 (file)
--- a/tests/f_uninit_last_uninit/script
+++ b/tests/f_uninit_last_uninit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 SKIP_GUNZIP="true"
 
@@ -20,7 +23,3 @@ export E2FSCK_TIME
 . $cmd_dir/run_e2fsck
 
 unset E2FSCK_TIME
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/j_corrupt_commit_csum/script b/tests/j_corrupt_commit_csum/script
index 9c169752d69b03e746d6581aa343d21e164b39e9..57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f 100644 (file)
--- a/tests/j_corrupt_commit_csum/script
+++ b/tests/j_corrupt_commit_csum/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -f $TMPFILE.cmd
 
 rm -f $TMPFILE
@@ -46,7 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_corrupt_commit_tid/script b/tests/j_corrupt_commit_tid/script
index 9c169752d69b03e746d6581aa343d21e164b39e9..57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f 100644 (file)
--- a/tests/j_corrupt_commit_tid/script
+++ b/tests/j_corrupt_commit_tid/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -f $TMPFILE.cmd
 
 rm -f $TMPFILE
@@ -46,7 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_corrupt_descr_csum/script b/tests/j_corrupt_descr_csum/script
index 9c169752d69b03e746d6581aa343d21e164b39e9..57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f 100644 (file)
--- a/tests/j_corrupt_descr_csum/script
+++ b/tests/j_corrupt_descr_csum/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -f $TMPFILE.cmd
 
 rm -f $TMPFILE
@@ -46,7 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_corrupt_descr_tid/script b/tests/j_corrupt_descr_tid/script
index 9c169752d69b03e746d6581aa343d21e164b39e9..57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f 100644 (file)
--- a/tests/j_corrupt_descr_tid/script
+++ b/tests/j_corrupt_descr_tid/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -f $TMPFILE.cmd
 
 rm -f $TMPFILE
@@ -46,7 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_corrupt_journal_block/script b/tests/j_corrupt_journal_block/script
index 2bce9733d91a9eb1dd52165aa7866002a748b58b..a881bd1c9a1c8be4171ebe0a3b2d8744857764d9 100644 (file)
--- a/tests/j_corrupt_journal_block/script
+++ b/tests/j_corrupt_journal_block/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 echo >> $OUT
 rm -f $TMPFILE.cmd
 
@@ -47,7 +50,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_corrupt_revoke_block/script b/tests/j_corrupt_revoke_block/script
index 9c169752d69b03e746d6581aa343d21e164b39e9..57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f 100644 (file)
--- a/tests/j_corrupt_revoke_block/script
+++ b/tests/j_corrupt_revoke_block/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -f $TMPFILE.cmd
 
 rm -f $TMPFILE
@@ -46,7 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_corrupt_revoke_csum/script b/tests/j_corrupt_revoke_csum/script
index 9c169752d69b03e746d6581aa343d21e164b39e9..57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f 100644 (file)
--- a/tests/j_corrupt_revoke_csum/script
+++ b/tests/j_corrupt_revoke_csum/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -f $TMPFILE.cmd
 
 rm -f $TMPFILE
@@ -46,7 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_corrupt_sb_csum/script b/tests/j_corrupt_sb_csum/script
index 9c169752d69b03e746d6581aa343d21e164b39e9..57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f 100644 (file)
--- a/tests/j_corrupt_sb_csum/script
+++ b/tests/j_corrupt_sb_csum/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -f $TMPFILE.cmd
 
 rm -f $TMPFILE
@@ -46,7 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_corrupt_sb_magic/script b/tests/j_corrupt_sb_magic/script
index 9c169752d69b03e746d6581aa343d21e164b39e9..57fc8fb56bbeb9f183e73ae4cdfb010a9036ff2f 100644 (file)
--- a/tests/j_corrupt_sb_magic/script
+++ b/tests/j_corrupt_sb_magic/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-fy
@@ -28,7 +31,7 @@ rm -f $OUT.new
 
 echo "cat /a" > $TMPFILE.cmd
 echo >> $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -f $TMPFILE.cmd
 
 rm -f $TMPFILE
@@ -46,7 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_ext_long_revoke_trans/script b/tests/j_ext_long_revoke_trans/script
index fe45c72ee33a7e0a9578cefcc4f6eb4194fefe36..21518edc49989853ddc78ea4d0b5dbb60fb7eb93 100644 (file)
--- a/tests/j_ext_long_revoke_trans/script
+++ b/tests/j_ext_long_revoke_trans/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -39,14 +42,14 @@ echo "jc" >> $TMPFILE.cmd
 echo "jo -f $JNLFILE" >> $TMPFILE.cmd
 echo "jw -r 259-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$JNLFILE" "$JOURNAL_DUMP_DIR/$test_name.img.jnl"
 echo "logdump -c -f $JNLFILE" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e 's/logdump -c -f.*/logdump -c/g' >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e 's/logdump -c -f.*/logdump -c/g' >> $OUT
 rm -rf $TMPFILE.cmd
 
 echo "debugfs fsck" >> $OUT
@@ -71,7 +74,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP JNLFILE
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_ext_long_trans/script b/tests/j_ext_long_trans/script
index f71e5a469ce58130e0414cd95ffba97101bcc9c7..5f7fa53589d023db586d1001a61ac488319d7402 100644 (file)
--- a/tests/j_ext_long_trans/script
+++ b/tests/j_ext_long_trans/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -36,14 +39,14 @@ echo "debugfs write journal" >> $OUT
 echo "jo -f $JNLFILE" > $TMPFILE.cmd
 echo "jw -b 259-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$JNLFILE" "$JOURNAL_DUMP_DIR/$test_name.img.jnl"
 echo "logdump -c -f $JNLFILE" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e 's/logdump -c -f.*/logdump -c/g' >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed -e 's/logdump -c -f.*/logdump -c/g' >> $OUT
 rm -rf $TMPFILE.cmd
 
 echo "debugfs fsck" >> $OUT
@@ -68,7 +71,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP JNLFILE
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_long_revoke_trans/script b/tests/j_long_revoke_trans/script
index 4a0c5d1fb080cf489a50424d751c26815f641a3e..bc330259aafb28e0f698be5f4f40a39c00ee785f 100644 (file)
--- a/tests/j_long_revoke_trans/script
+++ b/tests/j_long_revoke_trans/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -26,13 +29,13 @@ echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r 259-4356" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -56,7 +59,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_long_revoke_trans_mcsum_32bit/script b/tests/j_long_revoke_trans_mcsum_32bit/script
index fc0d0ad95d1acfa61dfc6f1ad47455f0d0cd170f..3e838ac915b76b1e3a945645d0a0b2a3748592e7 100644 (file)
--- a/tests/j_long_revoke_trans_mcsum_32bit/script
+++ b/tests/j_long_revoke_trans_mcsum_32bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -28,8 +31,8 @@ echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r 260-4356" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-#$DEBUGFS_EXE -w $TMPFILE -f $TMPFILE.cmd >> $OUT 2>&1
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+#$DEBUGFS -w $TMPFILE -f $TMPFILE.cmd >> $OUT 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -37,7 +40,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -61,7 +64,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_long_revoke_trans_mcsum_64bit/script b/tests/j_long_revoke_trans_mcsum_64bit/script
index e206f88d1b601f9d3eb41a6bb8eca37df339f711..eef9f0208be2e7747296fee5c4d2e8f7b1ddc44e 100644 (file)
--- a/tests/j_long_revoke_trans_mcsum_64bit/script
+++ b/tests/j_long_revoke_trans_mcsum_64bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -28,8 +31,8 @@ echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r 262-4358" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-#$DEBUGFS_EXE -w $TMPFILE -f $TMPFILE.cmd >> $OUT 2>&1
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+#$DEBUGFS -w $TMPFILE -f $TMPFILE.cmd >> $OUT 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -37,7 +40,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -61,7 +64,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_long_trans/script b/tests/j_long_trans/script
index 68172c42fb1ac781917078281b33470ac759db0b..425bf991cdc2e3a2d4c9ca836b299a4dd6f9d424 100644 (file)
--- a/tests/j_long_trans/script
+++ b/tests/j_long_trans/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -23,13 +26,13 @@ echo "debugfs write journal" >> $OUT
 echo "jo" > $TMPFILE.cmd
 echo "jw -b 259-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -53,7 +56,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_long_trans_mcsum_32bit/script b/tests/j_long_trans_mcsum_32bit/script
index 4722242f8bd62a905be727d96380facdcc90d2e8..f0297a4790fcc4800e35a05850aaf05c809a4e18 100644 (file)
--- a/tests/j_long_trans_mcsum_32bit/script
+++ b/tests/j_long_trans_mcsum_32bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -25,7 +28,7 @@ echo "debugfs write journal" >> $OUT
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b 260-4356 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -33,7 +36,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -57,7 +60,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_long_trans_mcsum_64bit/script b/tests/j_long_trans_mcsum_64bit/script
index 65ca1b7e64338999c0def91e1e8e278f93d4e9fa..a72f6f1b96c725b0973ae828e5d76e8cd9b66871 100644 (file)
--- a/tests/j_long_trans_mcsum_64bit/script
+++ b/tests/j_long_trans_mcsum_64bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -25,7 +28,7 @@ echo "debugfs write journal" >> $OUT
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b 262-4358 /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -33,7 +36,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -57,7 +60,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_revoke_trans/script b/tests/j_short_revoke_trans/script
index 4eec4362fd0eaf968cb4e0391839a33462e73e38..9d3ee0567f9383176478b4b86e90a243627a7a47 100644 (file)
--- a/tests/j_short_revoke_trans/script
+++ b/tests/j_short_revoke_trans/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -28,13 +31,13 @@ echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r $bitmaps" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -58,7 +61,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_revoke_trans_mcsum_64bit/script b/tests/j_short_revoke_trans_mcsum_64bit/script
index c943efa69d3337f5b4dbc23e30e5b837431d7fef..c9cc7cd8eec709d30f7989fc02154159fc1e7220 100644 (file)
--- a/tests/j_short_revoke_trans_mcsum_64bit/script
+++ b/tests/j_short_revoke_trans_mcsum_64bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -30,7 +33,7 @@ echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r $bitmaps" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -38,7 +41,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -62,7 +65,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_trans/script b/tests/j_short_trans/script
index 852e7a5177d0967b3aaeb07ff6121493ac61db8f..8108ba8509c375d4a01a30f7b9d44b9f255182cc 100644 (file)
--- a/tests/j_short_trans/script
+++ b/tests/j_short_trans/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -25,13 +28,13 @@ echo "debugfs write journal" >> $OUT
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -55,7 +58,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_trans_64bit/script b/tests/j_short_trans_64bit/script
index 994fa213c5b18a6ca33948fbad7beae2f4add13f..70649c23877de9de44b368f87ec5bffc8dce0578 100644 (file)
--- a/tests/j_short_trans_64bit/script
+++ b/tests/j_short_trans_64bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -27,7 +30,7 @@ echo "debugfs write journal" >> $OUT
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -35,7 +38,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -59,7 +62,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_trans_mcsum_64bit/script b/tests/j_short_trans_mcsum_64bit/script
index 034b23701988c1d442ba5094df57761335094447..ad736eb94270af05133cd0fd3f6c3aeffe94e231 100644 (file)
--- a/tests/j_short_trans_mcsum_64bit/script
+++ b/tests/j_short_trans_mcsum_64bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -27,7 +30,7 @@ echo "debugfs write journal" >> $OUT
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -35,7 +38,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -59,7 +62,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_trans_old_csum/script b/tests/j_short_trans_old_csum/script
index 56f8bcbb65ab836dbb78cecbea233ef04d79c83f..cb13acbb5a188110ccf88d1583c53ea387cb96a7 100644 (file)
--- a/tests/j_short_trans_old_csum/script
+++ b/tests/j_short_trans_old_csum/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -27,7 +30,7 @@ echo "debugfs write journal" >> $OUT
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -35,7 +38,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -59,7 +62,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_trans_open_recover/script b/tests/j_short_trans_open_recover/script
index 67136fe61eddc333137d49c4399e37161be4df66..fe1d9e8e1ca4dc9693a1b70cfa5410a55e855f9c 100644 (file)
--- a/tests/j_short_trans_open_recover/script
+++ b/tests/j_short_trans_open_recover/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -25,20 +28,20 @@ echo "debugfs write journal" >> $OUT
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 echo "debugfs can't recover open journal" >> $OUT
 echo "jo" > $TMPFILE.cmd
 echo "jr" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE > $OUT.new 2>&1
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE > $OUT.new 2>&1
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -63,7 +66,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_trans_recover/script b/tests/j_short_trans_recover/script
index e7b49437fa68d275d92e9d3866974b5739ae0290..a44111b7b93a2c681d24169d0c3e2651e37225ef 100644 (file)
--- a/tests/j_short_trans_recover/script
+++ b/tests/j_short_trans_recover/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -28,18 +31,18 @@ echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r 333" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 echo "debugfs recover journal" >> $OUT
 echo "jr" > $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -64,7 +67,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_trans_recover_mcsum_64bit/script b/tests/j_short_trans_recover_mcsum_64bit/script
index 2c56e0ff17598987a2a12f2c1736b1a110c7cfa5..9671b8cd2bf2c414c594349ebb68983f9895dbd9 100644 (file)
--- a/tests/j_short_trans_recover_mcsum_64bit/script
+++ b/tests/j_short_trans_recover_mcsum_64bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -30,7 +33,7 @@ echo "jc" >> $TMPFILE.cmd
 echo "jo" >> $TMPFILE.cmd
 echo "jw -r 333" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -38,12 +41,12 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 echo "debugfs recover journal" >> $OUT
 echo "jr" > $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -68,7 +71,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_uncommitted_trans/script b/tests/j_short_uncommitted_trans/script
index a1fc3b445d1718a0a152be7e20aabcc61e19f27c..ef0548ba1d4a76c3e94976bff70855efc716e329 100644 (file)
--- a/tests/j_short_uncommitted_trans/script
+++ b/tests/j_short_uncommitted_trans/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -25,13 +28,13 @@ echo "debugfs write journal" >> $OUT
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps -c /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -55,7 +58,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/j_short_uncommitted_trans_mcsum_64bit/script b/tests/j_short_uncommitted_trans_mcsum_64bit/script
index a0b8c7f5c24cc2298326f603227b52d1ca3314b1..68965a9d1a6ed9187b56466fa21c28daccf7374f 100644 (file)
--- a/tests/j_short_uncommitted_trans_mcsum_64bit/script
+++ b/tests/j_short_uncommitted_trans_mcsum_64bit/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -27,7 +30,7 @@ echo "debugfs write journal" >> $OUT
 echo "jo -c" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero -c" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -35,7 +38,7 @@ $DUMPE2FS $TMPFILE 2>&1 | grep '^Journal features:' >> $OUT
 
 test -d "$JOURNAL_DUMP_DIR" -a -w "$JOURNAL_DUMP_DIR" && cp "$TMPFILE" "$JOURNAL_DUMP_DIR/$test_name.img"
 echo "logdump -c" > $TMPFILE.cmd
-$DEBUGFS_EXE -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
+$DEBUGFS -f $TMPFILE.cmd $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT
 rm -rf $TMPFILE.cmd
 
 $FSCK -fy -N test_filesys $TMPFILE > $OUT.new 2>&1
@@ -59,7 +62,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/m_devdir/script b/tests/m_devdir/script
index 5f266997209414eff14fb474f335fe9221e37fab..3b1ef10bd57969cfd649754512bf4a7396c8c97b 100644 (file)
--- a/tests/m_devdir/script
+++ b/tests/m_devdir/script
@@ -1,6 +1,9 @@
-if test -x $DEBUGFS_EXE; then
-
 test_description="create fs image from /dev"
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
+
 MKFS_DIR=/dev
 OUT=$test_name.log
 
@@ -27,7 +30,3 @@ fi
 
 rm -rf $TMPFILE.cmd $OUT.sed
 unset MKFS_DIR OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/m_minrootdir/script b/tests/m_minrootdir/script
index 662e76f49b0c8bfd7182a25a8e02406b4baa4a39..365599384fa9694a7a2aabb0369b289db440686a 100644 (file)
--- a/tests/m_minrootdir/script
+++ b/tests/m_minrootdir/script
@@ -1,6 +1,9 @@
-if test -x $DEBUGFS_EXE -a -x $RESIZE2FS_EXE; then
-
 test_description="create fs image from dir, then minimize it"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
+
 MKFS_DIR=$TMPFILE.dir
 OUT=$test_name.log
 EXP=$test_dir/expect
@@ -75,7 +78,3 @@ fi
 
 rm -rf $TMPFILE.cmd $MKFS_DIR $OUT.sed
 unset MKFS_DIR OUT EXP
-
-else #if test -x $DEBUGFS_EXE -a -x RESIZE2FS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/m_rootdir/script b/tests/m_rootdir/script
index fbe1b31ea72dc268b59bc47dc2b35f15596de0e6..86a0b101a7015a7289fa3709b9dbfc4f20c943f2 100644 (file)
--- a/tests/m_rootdir/script
+++ b/tests/m_rootdir/script
@@ -1,6 +1,9 @@
-if test -x $DEBUGFS_EXE; then
-
 test_description="create fs image from dir"
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
+
 MKFS_DIR=$TMPFILE.dir
 OUT=$test_name.log
 EXP=$test_dir/expect
@@ -65,7 +68,3 @@ fi
 
 rm -rf $TMPFILE.cmd $MKFS_DIR $OUT.sed
 unset MKFS_DIR OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/r_1024_small_bg/script b/tests/r_1024_small_bg/script
index 2038cb96d88c27b7222864b46e84552b040cd163..65276ab792db273fd3f7dd33069bed1ebe97f7d7 100644 (file)
--- a/tests/r_1024_small_bg/script
+++ b/tests/r_1024_small_bg/script
@@ -1,6 +1,9 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-
 test_description="ext2 1024 blocksize with small block groups"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
+
 FEATURES="-t ext2 -O ^resize_inode -b 1024 -g 1024"
 SIZE_1=64M
 SIZE_2=2G
@@ -25,7 +28,3 @@ fi
 
 unset FEATURES SIZE_1 SIZE_2 LOG E2FSCK
 
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 
-

diff --git a/tests/r_32to64bit/script b/tests/r_32to64bit/script
index de08bfb6422a864cbb0599cf51075b01068f8974..6ecdf906824740d65c24648815b044af487fbdf0 100644 (file)
--- a/tests/r_32to64bit/script
+++ b/tests/r_32to64bit/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-fn
 OUT=$test_name.log
@@ -67,8 +70,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_32to64bit_expand_full/script b/tests/r_32to64bit_expand_full/script
index 7a570841a35071c81d3c6d5602a9f6af8ebbbce7..ee888fe0fd71eb2e0ff8ec121103467d394393a9 100644 (file)
--- a/tests/r_32to64bit_expand_full/script
+++ b/tests/r_32to64bit_expand_full/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-fn
 OUT=$test_name.log
@@ -76,8 +79,3 @@ fi
 rm $OUT.before $OUT.after
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_32to64bit_meta/script b/tests/r_32to64bit_meta/script
index 25872c4d4c45abd2e6ae646030de59bdb93b5a49..9711af0faf4b12e43a3182b2271f9758993808b4 100644 (file)
--- a/tests/r_32to64bit_meta/script
+++ b/tests/r_32to64bit_meta/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-fn
 OUT=$test_name.log
@@ -67,8 +70,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_32to64bit_move_itable/script b/tests/r_32to64bit_move_itable/script
index c188acdc31aa5501c81cfbabef74df3a976731fe..6b339af23e9990e1e6b40c48a7880c54d6cafff2 100644 (file)
--- a/tests/r_32to64bit_move_itable/script
+++ b/tests/r_32to64bit_move_itable/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-fn
 OUT=$test_name.log
@@ -67,8 +70,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_64bit_big_expand/script b/tests/r_64bit_big_expand/script
index 0319f0e0cfe0d8c681cb8391f3a12a4f90e326b0..f514d501e99b16cea100df4293b54acf6e02f2df 100644 (file)
--- a/tests/r_64bit_big_expand/script
+++ b/tests/r_64bit_big_expand/script
@@ -1,6 +1,9 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-
 test_description="very large fs growth using ext4 w/64bit"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
+
 FEATURES="-t ext4 -O 64bit"
 SIZE_1=512M
 SIZE_2=2T
@@ -29,8 +32,3 @@ else
 fi
 
 unset FEATURES SIZE_1 SIZE_2 LOG E2FSCK
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 
-

diff --git a/tests/r_64to32bit/script b/tests/r_64to32bit/script
index 5d959f03a6d9fd0f4ebe3ff1f3443d69cf2b8373..02718bdb9f079e4d861d9f9bffc9b00945b245b3 100644 (file)
--- a/tests/r_64to32bit/script
+++ b/tests/r_64to32bit/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-fn
 OUT=$test_name.log
@@ -69,8 +72,3 @@ fi
 rm $OUT.before $OUT.after
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_64to32bit_meta/script b/tests/r_64to32bit_meta/script
index 5a02e2664393f0a695cc85b6de338c737e123f21..69b33cc3a3b67f037c6fef9926009a907b14b932 100644 (file)
--- a/tests/r_64to32bit_meta/script
+++ b/tests/r_64to32bit_meta/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-fn
 OUT=$test_name.log
@@ -69,8 +72,3 @@ fi
 rm $OUT.before $OUT.after
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_bigalloc_big_expand/script b/tests/r_bigalloc_big_expand/script
index d939aea28e4a4d93ef46b47b9603fe32e9a73a5f..0c9986bb47bfed02d5e2ef3baafbfbbac002faf6 100644 (file)
--- a/tests/r_bigalloc_big_expand/script
+++ b/tests/r_bigalloc_big_expand/script
@@ -1,6 +1,9 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-
 test_description="ext4 with bigalloc"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
+
 FEATURES="-t ext4 -O bigalloc"
 SIZE_1=512M
 SIZE_2=2T
@@ -30,8 +33,3 @@ else
 fi
 
 unset FEATURES SIZE_1 SIZE_2 LOG E2FSCK
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 
-

diff --git a/tests/r_expand_full/script b/tests/r_expand_full/script
index 672829fe9b8913597e54f1fdfe8b93fae31ab4de..4a751f73ed06715b015c272b6839cc70210514d2 100644 (file)
--- a/tests/r_expand_full/script
+++ b/tests/r_expand_full/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-fn
 OUT=$test_name.log
@@ -78,8 +81,3 @@ fi
 rm $OUT.before $OUT.after
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_ext4_big_expand/script b/tests/r_ext4_big_expand/script
index 1b8c823ec631cf38d43478e9dfe3fc1cdb8b500c..266c9039cbfe72e0bc68f7e3d068d7c79ccdf1fb 100644 (file)
--- a/tests/r_ext4_big_expand/script
+++ b/tests/r_ext4_big_expand/script
@@ -1,6 +1,9 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-
 test_description="very large fs growth using ext4"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
+
 FEATURES="-t ext4"
 SIZE_1=512M
 SIZE_2=2T
@@ -29,8 +32,3 @@ else
 fi
 
 unset FEATURES SIZE_1 SIZE_2 LOG E2FSCK
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 
-

diff --git a/tests/r_ext4_small_bg/script b/tests/r_ext4_small_bg/script
index cdc6e4a3e8a7058cd3b31bd959c5748460cb0b26..87f5084daf7880676bbd931d0a538cb69736ada5 100644 (file)
--- a/tests/r_ext4_small_bg/script
+++ b/tests/r_ext4_small_bg/script
@@ -1,6 +1,9 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-
 test_description="ext4 1024 blocksize with small block groups"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
+
 FEATURES="-t ext4 -O ^resize_inode -b 1024 -g 512"
 SIZE_1=64M
 SIZE_2=2G
@@ -24,8 +27,3 @@ else
 fi
 
 unset FEATURES SIZE_1 SIZE_2 LOG E2FSCK
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 
-

diff --git a/tests/r_fixup_lastbg/script b/tests/r_fixup_lastbg/script
index 6a5c5af63493a6733763d867029a7142669c08cc..04514210d392506669e1b3b44c5100e824519808 100755 (executable)
--- a/tests/r_fixup_lastbg/script
+++ b/tests/r_fixup_lastbg/script
@@ -1,5 +1,8 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
 test_description="fix up last bg when expanding within the last bg"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 EXP=$test_dir/expect
 OUT=$test_name.out
@@ -31,7 +34,3 @@ else
 fi
 
 unset EXP LOG OUT E2FSCK
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/r_fixup_lastbg_big/script b/tests/r_fixup_lastbg_big/script
index 97d9fd4affe1d2c230f47303ae7385e922cb7fea..a12fb1674685ee1adc6694965d6daf49985db953 100755 (executable)
--- a/tests/r_fixup_lastbg_big/script
+++ b/tests/r_fixup_lastbg_big/script
@@ -1,5 +1,8 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
 test_description="fix up last bg when expanding beyond the last bg"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 EXP=$test_dir/expect
 OUT=$test_name.out
@@ -31,7 +34,3 @@ else
 fi
 
 unset EXP LOG OUT E2FSCK
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/r_inline_xattr/script b/tests/r_inline_xattr/script
index eb2085d87d6ac67508e9cebb5a00e0bb4b896329..04baac859fea82b7bf1520af1f45c6ef32251543 100644 (file)
--- a/tests/r_inline_xattr/script
+++ b/tests/r_inline_xattr/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-yf
@@ -46,8 +49,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_meta_bg_shrink/script b/tests/r_meta_bg_shrink/script
index de7777758db7ce8d2a7aa82666f6d09c694fb93b..c47d4ff885401230751d34cc23950584867bcdfb 100644 (file)
--- a/tests/r_meta_bg_shrink/script
+++ b/tests/r_meta_bg_shrink/script
@@ -1,6 +1,9 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-
 test_description="meta_bg shrink"
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
+
 FEATURES="-t ext4 -O 64bit,meta_bg,^resize_inode -b 1024"
 SIZE_1=1G
 SIZE_2=48M
@@ -27,8 +30,3 @@ else
 fi
 
 unset FEATURES SIZE_1 SIZE_2 LOG E2FSCK
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_min_itable/script b/tests/r_min_itable/script
index beb6cf9c9a73a8ed17c315833b0ac4ab47ce2767..e7787360e4774e6e7777bcc67400139b0f79ed30 100644 (file)
--- a/tests/r_min_itable/script
+++ b/tests/r_min_itable/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-yf
@@ -38,8 +41,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/r_move_itable/script b/tests/r_move_itable/script
index 3f02a799f2f5ac661f70103b568b787ff520b93b..6109f35f146e960552f2be378cb63f30cc45bf1b 100644 (file)
--- a/tests/r_move_itable/script
+++ b/tests/r_move_itable/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-yf
 OUT=$test_name.log
@@ -110,7 +113,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/r_move_itable_nostride/script b/tests/r_move_itable_nostride/script
index 261ef539049fb98e88e3726aa284cf1806daedb2..d3b95b12e91838ec5a35fadb9f5ddf1dc63b7f7e 100644 (file)
--- a/tests/r_move_itable_nostride/script
+++ b/tests/r_move_itable_nostride/script
@@ -10,7 +10,10 @@ if [ $(uname -s) = "Darwin" ]; then
        return 0
 fi
 
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-yf
 OUT=$test_name.log
@@ -63,7 +66,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/r_move_itable_realloc/script b/tests/r_move_itable_realloc/script
index c42ec045300458711b1fe264cbee2531c7e0fa96..7005bf805bd598185bcfa3e53c8736007c4c74c8 100644 (file)
--- a/tests/r_move_itable_realloc/script
+++ b/tests/r_move_itable_realloc/script
@@ -10,7 +10,10 @@ if [ $(uname -s) = "Darwin" ]; then
        return 0
 fi
 
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-yf
 OUT=$test_name.log
@@ -63,7 +66,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi 

diff --git a/tests/run_mke2fs b/tests/run_mke2fs
index 82eca41aee0bfd9acfec027eb98abd5d42905a9a..2a784fe611946180a62e60544dc4f77bf59cf5e6 100644 (file)
--- a/tests/run_mke2fs
+++ b/tests/run_mke2fs
@@ -20,7 +20,7 @@ AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT1'
 
 else #if test -x $DEBUGFS_EXE; then
        rm -f $test_name.ok $test_name.failed
-       echo "skipped"
+       echo "skipped (no debugfs)"
 fi 
 
 unset DESCRIPTION FS_SIZE MKE2FS_OPTS MKE2FS_SKIP_PROGRESS \

diff --git a/tests/t_iexpand_full/script b/tests/t_iexpand_full/script
index f8565a74029006579c279a827271c50c84554244..875c70e85e64327b205712e4fdd129c7ef4b67b5 100644 (file)
--- a/tests/t_iexpand_full/script
+++ b/tests/t_iexpand_full/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 if [ $(uname -s) = "Darwin" ]; then
        # creates a 3GB filesystem
@@ -78,8 +81,3 @@ fi
 rm $OUT.before $OUT.after
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/t_iexpand_mcsum/script b/tests/t_iexpand_mcsum/script
index 4b584d37744495ebaf27ed4ce72c7f813b0146f3..116cad902d604a3c1776873c118935ad926f34f1 100644 (file)
--- a/tests/t_iexpand_mcsum/script
+++ b/tests/t_iexpand_mcsum/script
@@ -1,4 +1,8 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
+
 if [ $(uname -s) = "Darwin" ]; then
        # creates a 3GB filesystem
        echo "$test_name: $DESCRIPTION: skipped for HFS+ (no sparse files)"
@@ -78,8 +82,3 @@ fi
 rm $OUT.before $OUT.after
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-

diff --git a/tests/t_replay_and_set/script b/tests/t_replay_and_set/script
index 36411fcfe9649d0e49849437a16881cde2629103..bec9108a78a8009cb3eecdb155d09abc6ebe8e6d 100644 (file)
--- a/tests/t_replay_and_set/script
+++ b/tests/t_replay_and_set/script
@@ -1,4 +1,7 @@
-if test -x $DEBUGFS_EXE; then
+if ! test -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
+fi
 
 FSCK_OPT=-fy
 OUT=$test_name.log
@@ -25,7 +28,7 @@ echo "debugfs write journal" >> $OUT
 echo "jo" > $TMPFILE.cmd
 echo "jw -b $bitmaps /dev/zero" >> $TMPFILE.cmd
 echo "jc" >> $TMPFILE.cmd
-$DEBUGFS_EXE -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
+$DEBUGFS -w -f $TMPFILE.cmd $TMPFILE 2>> $OUT.new > /dev/null
 sed -f $cmd_dir/filter.sed < $OUT.new >> $OUT
 rm -rf $OUT.new
 
@@ -54,7 +57,3 @@ else
 fi
 
 unset IMAGE FSCK_OPT OUT EXP
-
-else #if test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi

diff --git a/tests/u_debugfs_opt/script b/tests/u_debugfs_opt/script
index bb93917e77763256b9f535b208c30a6d28810c51..b5a65ec2a11935c37c79e840fd629b6689d17fad 100644 (file)
--- a/tests/u_debugfs_opt/script
+++ b/tests/u_debugfs_opt/script
@@ -1,5 +1,8 @@
 test_description="e2undo with debugfs -z"
-if test -x $E2UNDO_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $E2UNDO_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/e2undo)"
+       return 0
+fi
 
 TDB_FILE=${TMPDIR:-/tmp}/tune2fs-$(basename $TMPFILE).e2undo
 OUT=$test_name.log
@@ -29,4 +32,3 @@ else
        echo "$test_name: $test_description: failed"
 fi
 rm -f $TDB_FILE $TMPFILE
-fi