From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 3 Sep 2011 14:04:37 +0000 (-0400)
Subject: tests: skip tests that require debugfs if debugfs has not been built
X-Git-Tag: v1.42-WIP-0916~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=906a1cf9b60b336ccf44706c7f1906056282fbf0;p=thirdparty%2Fe2fsprogs.git

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>
---

diff --git a/tests/d_loaddump/script b/tests/d_loaddump/script
index 598f66567..48253752b 100644
--- a/tests/d_loaddump/script
+++ b/tests/d_loaddump/script
@@ -1,3 +1,5 @@
+if test -x $DEBUGFS_EXE; then
+
 OUT=$test_name.log
 EXP=$test_dir/expect
 VERIFY_FSCK_OPT=-yf
@@ -59,3 +61,7 @@ fi
 
 unset VERIFY_FSCK_OPT NATIVE_FSCK_OPT OUT EXP TEST_DATA VERIFY_DATA
 
+else #if test -x $DEBUGFS_EXE; then
+	rm -f $test_name.ok $test_name.failed
+	echo "skipped"
+fi 
diff --git a/tests/f_dup4/script b/tests/f_dup4/script
index 350f88e66..290dcc923 100644
--- a/tests/f_dup4/script
+++ b/tests/f_dup4/script
@@ -1,3 +1,5 @@
+if test -x $DEBUGFS_EXE; then
+
 SKIP_GUNZIP="true"
 TEST_DATA="test.data"
 
@@ -48,3 +50,8 @@ export E2FSCK_TIME
 rm -f $TEST_DATA
 
 unset E2FSCK_TIME TEST_DATA
+
+else #if test -x $DEBUGFS_EXE; then
+	rm -f $test_name.ok $test_name.failed
+	echo "skipped"
+fi 
diff --git a/tests/f_dup_de/script b/tests/f_dup_de/script
index 84c8bfff9..d331003f1 100644
--- a/tests/f_dup_de/script
+++ b/tests/f_dup_de/script
@@ -1,3 +1,5 @@
+if test -x $DEBUGFS_EXE; then
+
 if test "$HTREE"x = x ; then
 	gunzip < $test_dir/image.gz > $TMPFILE
 	$DEBUGFS -w -R "feature ^dir_index" $TMPFILE >/dev/null 2>&1
@@ -8,3 +10,8 @@ if test "$HTREE"x = x ; then
 fi
 . $cmd_dir/run_e2fsck
 rm -f "$TMPFILE".gz
+
+else #if test -x $DEBUGFS_EXE; then
+	rm -f $test_name.ok $test_name.failed
+	echo "skipped"
+fi 
diff --git a/tests/f_dup_resize/script b/tests/f_dup_resize/script
index 7a5214c0d..3f87cbba1 100644
--- a/tests/f_dup_resize/script
+++ b/tests/f_dup_resize/script
@@ -1,3 +1,5 @@
+if test -x $DEBUGFS_EXE; then
+
 SKIP_GUNZIP="true"
 TEST_DATA="test.data"
 
@@ -22,3 +24,8 @@ export E2FSCK_TIME
 rm -f $TEST_DATA
 
 unset E2FSCK_TIME TEST_DATA
+
+else #if test -x $DEBUGFS_EXE; then
+	rm -f $test_name.ok $test_name.failed
+	echo "skipped"
+fi 
diff --git a/tests/f_imagic_fs/script b/tests/f_imagic_fs/script
index 572ace154..3941be00d 100644
--- a/tests/f_imagic_fs/script
+++ b/tests/f_imagic_fs/script
@@ -1,3 +1,10 @@
+if test -x $DEBUGFS_EXE; then
+
 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
+	rm -f $test_name.ok $test_name.failed
+	echo "skipped"
+fi 
diff --git a/tests/f_resize_inode/script b/tests/f_resize_inode/script
index 327f41ba2..a010fd982 100644
--- a/tests/f_resize_inode/script
+++ b/tests/f_resize_inode/script
@@ -1,3 +1,5 @@
+if test -x $DEBUGFS_EXE; then
+
 printf "e2fsck with resize_inode: "
 FSCK_OPT=-yf
 OUT=$test_name.log
@@ -138,3 +140,7 @@ fi
 
 unset IMAGE FSCK_OPT OUT EXP
 
+else #if test -x $DEBUGFS_EXE; then
+	rm -f $test_name.ok $test_name.failed
+	echo "skipped"
+fi 
diff --git a/tests/f_uninit_last_uninit/script b/tests/f_uninit_last_uninit/script
index 870032927..4fcab1b3f 100644
--- a/tests/f_uninit_last_uninit/script
+++ b/tests/f_uninit_last_uninit/script
@@ -1,3 +1,5 @@
+if test -x $DEBUGFS_EXE; then
+
 SKIP_GUNZIP="true"
 
 touch $TMPFILE
@@ -18,3 +20,8 @@ export E2FSCK_TIME
 . $cmd_dir/run_e2fsck
 
 unset E2FSCK_TIME
+
+else #if test -x $DEBUGFS_EXE; then
+	rm -f $test_name.ok $test_name.failed
+	echo "skipped"
+fi 
diff --git a/tests/r_inline_xattr/script b/tests/r_inline_xattr/script
index d9c364409..e4e0f536f 100644
--- a/tests/r_inline_xattr/script
+++ b/tests/r_inline_xattr/script
@@ -1,4 +1,4 @@
-if test -x $RESIZE2FS_EXE; then
+if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
 
 IMAGE=$test_dir/image.gz
 FSCK_OPT=-yf
@@ -48,7 +48,7 @@ fi
 
 unset IMAGE FSCK_OPT OUT EXP
 
-else #if test -x $RESIZE2FS; then
+else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
         rm -f $test_name.ok $test_name.failed
         echo "skipped"
 fi
diff --git a/tests/r_move_itable/script b/tests/r_move_itable/script
index c257e429c..56a861b0f 100644
--- a/tests/r_move_itable/script
+++ b/tests/r_move_itable/script
@@ -1,4 +1,4 @@
-if test -x $RESIZE2FS_EXE; then
+if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
 
 FSCK_OPT=-yf
 OUT=$test_name.log
@@ -112,7 +112,7 @@ fi
 
 unset IMAGE FSCK_OPT OUT EXP
 
-else #if test -x $RESIZE2FS; then
+else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
 	rm -f $test_name.ok $test_name.failed
 	echo "skipped"
 fi 
diff --git a/tests/run_mke2fs b/tests/run_mke2fs
index ab807a5a3..a3a77432b 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
diff --git a/tests/test_config b/tests/test_config
index b0e3ee69d..7c5976642 100644
--- a/tests/test_config
+++ b/tests/test_config
@@ -12,6 +12,7 @@ LSATTR="$USE_VALGRIND ../misc/lsattr"
 E2IMAGE="$USE_VALGRIND ../misc/e2image"
 E2IMAGE_EXE="../misc/e2image"
 DEBUGFS="$USE_VALGRIND ../debugfs/debugfs"
+DEBUGFS_EXE="../debugfs/debugfs"
 TEST_BITS="../debugfs/debugfs"
 RESIZE2FS_EXE="../resize/resize2fs"
 RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE"