tests: clean up $DEBUGFS_EXE usage in scripts

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

diff --git a/tests/d_inline_dump/script b/tests/d_inline_dump/script
index 8d97729..3193f78 100644 (file)
--- a/tests/d_inline_dump/script
+++ b/tests/d_inline_dump/script
@@ -1,6 +1,6 @@
 if ! test -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-       exit 0
+       echo "$test_name: $test_description: skipped (no debugfs)"
+       return 0
 fi
 
 OUT=$test_name.log
@@ -11,21 +11,21 @@ ZIMAGE=$test_dir/image.gz
 gzip -d < $ZIMAGE > $TMPFILE
 
 echo "*** long file" > $OUT
-$DEBUGFS -R 'stat /file' $TMPFILE >> $OUT 2>&1
+$DEBUGFS -R 'stat /file' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
 echo "*** short file" >> $OUT
-$DEBUGFS -R 'stat /shortfile' $TMPFILE >> $OUT 2>&1
+$DEBUGFS -R 'stat /shortfile' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
 echo >> $OUT
 
 echo "*** long dir" >> $OUT
-$DEBUGFS -R 'stat /dir' $TMPFILE >> $OUT 2>&1
+$DEBUGFS -R 'stat /dir' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
 echo "*** short dir" >> $OUT
-$DEBUGFS -R 'stat /shortdir' $TMPFILE >> $OUT 2>&1
+$DEBUGFS -R 'stat /shortdir' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
 echo >> $OUT
 
 echo "*** long link" >> $OUT
-$DEBUGFS -R 'stat /link' $TMPFILE >> $OUT 2>&1
+$DEBUGFS -R 'stat /link' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
 echo "*** short link" >> $OUT
-$DEBUGFS -R 'stat /shortlink' $TMPFILE >> $OUT 2>&1
+$DEBUGFS -R 'stat /shortlink' $TMPFILE 2>&1 | $CLEAN_OUTPUT >> $OUT 2>&1
 
 echo "*** end test" >> $OUT