tests: clean up $DEBUGFS_EXE usage in scripts

[tools/e2fsprogs.git] / tests / f_badcluster / script

diff --git a/tests/f_badcluster/script b/tests/f_badcluster/script
index ea9e488..0012594 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