config: update config.{guess,sub}

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

diff --git a/tests/r_expand_full/script b/tests/r_expand_full/script
index 861a68a..8b25652 100644 (file)
--- a/tests/r_expand_full/script
+++ b/tests/r_expand_full/script
@@ -1,4 +1,7 @@
-if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
+if ! test -x $RESIZE2FS_EXE -o ! -x $DEBUGFS_EXE; then
+       echo "$test_name: $test_description: skipped (no debugfs/resize2fs)"
+       return 0
+fi
 
 FSCK_OPT=-fn
 OUT=$test_name.log
@@ -23,13 +26,19 @@ cat > $CONF << ENDL
        }
 ENDL
 
+if [ $(uname -s) = "Darwin" ]; then
+       # creates a 786MB filesystem
+       echo "$test_name: $DESCRIPTION: skipped for HFS+ (no sparse files)"
+       return 0
+fi
+
 echo "resize2fs test" > $OUT
 
 MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 786432 >> $OUT 2>&1
-rm -rf $CONF
+rm -f $CONF
 
 # dump and check
-$DUMPE2FS -g $TMPFILE 2>&1 >> $OUT.before 2> /dev/null
+$DUMPE2FS -g $TMPFILE >> $OUT.before 2> /dev/null
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
@@ -37,12 +46,12 @@ echo Exit status is $status >> $OUT
 # convert it
 echo "resize2fs test.img" >> $OUT
 $DD if=/dev/zero of=$TMPFILE conv=notrunc bs=1 count=1 seek=3221225471 2> /dev/null
-$RESIZE2FS -f $TMPFILE 2>&1 >> $OUT 2>&1
+$RESIZE2FS -f $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 
 # dump and check
-$DUMPE2FS -g $TMPFILE 2>&1 >> $OUT.after 2> /dev/null
+$DUMPE2FS -g $TMPFILE >> $OUT.after 2> /dev/null
 echo "Change in FS metadata:" >> $OUT
 diff -u $OUT.before $OUT.after | tail -n +3 >> $OUT
 $FSCK $FSCK_OPT -N test_filesys $TMPFILE >> $OUT 2>&1
@@ -72,8 +81,3 @@ fi
 rm $OUT.before $OUT.after
 
 unset IMAGE FSCK_OPT OUT EXP CONF
-
-else #if test -x $RESIZE2FS_EXE -a -x $DEBUGFS_EXE; then
-       echo "$test_name: $test_description: skipped"
-fi
-