LU-6722 jbd: double minimum journal size for RHEL7

[tools/e2fsprogs.git] / tests / run_mke2fs

diff --git a/tests/run_mke2fs b/tests/run_mke2fs
index d1a0657..7a47f56 100644 (file)
--- a/tests/run_mke2fs
+++ b/tests/run_mke2fs
@@ -1,3 +1,5 @@
+if test -x $DEBUGFS_EXE; then
+
 if [ "$FS_SIZE"x = x ]; then
        FS_SIZE=1024
 fi
@@ -9,6 +11,17 @@ MKE2FS_SKIP_PROGRESS=true
 MKE2FS_SKIP_CHECK_MSG=true
 export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG
 > $TMPFILE
-PREP_CMD='$MKE2FS -F $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d > $OUT1 ; $DEBUGFS -R features $TMPFILE 2>&1 | sed -e 1d >> $OUT1 ; echo " " >> $OUT1'
+PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 |
+       sed -f $cmd_dir/filter.sed >> $OUT1;
+       $DEBUGFS -R features $TMPFILE 2>&1 |
+       sed -f $cmd_dir/filter.sed >> $OUT1'
+AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter.sed >> $OUT1'
 . $cmd_dir/run_e2fsck
-unset FS_SIZE MKE2FS_OPTS MKE2FS_SKIP_PROGRESS
+
+else #if test -x $DEBUGFS_EXE; then
+       rm -f $test_name.ok $test_name.failed
+       echo "skipped (no debugfs)"
+fi 
+
+unset DESCRIPTION FS_SIZE MKE2FS_OPTS MKE2FS_SKIP_PROGRESS \
+       MKE2FS_DEVICE_SECTSIZE