summaryrefslogtreecommitdiff
path: root/tests/run_mke2fs
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2011-09-03 10:04:37 -0400
committerTheodore Ts'o <tytso@mit.edu>2011-09-03 10:04:37 -0400
commit906a1cf9b60b336ccf44706c7f1906056282fbf0 (patch)
treeb643c0774ef9ce70008147af06c7f27aa48496c6 /tests/run_mke2fs
parentf305fd7f0c65391819f9813512714c932965a842 (diff)
downloade2fsprogs-906a1cf9b60b336ccf44706c7f1906056282fbf0.tar.gz
tests: skip tests that require debugfs if debugfs has not been built
Avoid lots of tests failing if e2fsprogs is compiled with --disable-debugfs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'tests/run_mke2fs')
-rw-r--r--tests/run_mke2fs11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/run_mke2fs b/tests/run_mke2fs
index ab807a5a..a3a77432 100644
--- 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
@@ -12,4 +14,11 @@ export MKE2FS_SKIP_PROGRESS MKE2FS_SKIP_CHECK_MSG
PREP_CMD='$MKE2FS -F -o Linux $MKE2FS_OPTS $TMPFILE $FS_SIZE 2>&1 | sed -e 1d | tr -d \\015 > $OUT1 ; $DEBUGFS -R features $TMPFILE 2>&1 | sed -e 1d | tr -d \\015 >> $OUT1 ; echo " " >> $OUT1'
AFTER_CMD='$DUMPE2FS $TMPFILE 2>&1 | sed -f $cmd_dir/filter_dumpe2fs | tr -d \\015 >> $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"
+fi
+
+unset DESCRIPTION FS_SIZE MKE2FS_OPTS MKE2FS_SKIP_PROGRESS \
+ MKE2FS_DEVICE_SECTSIZE