tests: force test file systems to be built for the Linux OS

This is needed to fix a large number of test failures on GNU Hurd.

Also skip a number of tests that require creating very large test file
systems,since Hurd does not support files greater than 4GB.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/tests/f_bigalloc_badinode/script b/tests/f_bigalloc_badinode/script
index c1dd45461dda708b04a13bb7e0ada6e7d297bb02..6ceb6ee412183dd8476c152ade31461825f0c25b 100644 (file)
--- a/tests/f_bigalloc_badinode/script
+++ b/tests/f_bigalloc_badinode/script
@@ -9,7 +9,7 @@ TEST_DATA="$test_name.tmp"
 dd if=$TEST_BITS of=$TEST_DATA bs=4k count=2 seek=1> /dev/null 2>&1
 
 touch $TMPFILE
-$MKE2FS -Fq -t ext4 -O bigalloc -C 16384 $TMPFILE 1M > /dev/null 2>&1
+$MKE2FS -Fq -t ext4 -o Linux -O bigalloc -C 16384 $TMPFILE 1M > /dev/null 2>&1
 $DEBUGFS -w $TMPFILE << EOF > /dev/null 2>&1
 write $TEST_DATA testfile
 set_inode_field testfile i_mode 0120000

diff --git a/tests/f_bigalloc_orphan_list/script b/tests/f_bigalloc_orphan_list/script
index b48d5c0d59eee32b3cecbbb4ac18f67dbdbdabff..8a062dc1dc394afebe769873cb49977d0c6603ae 100644 (file)
--- a/tests/f_bigalloc_orphan_list/script
+++ b/tests/f_bigalloc_orphan_list/script
@@ -9,7 +9,7 @@ TEST_DATA="$test_name.tmp"
 dd if=$TEST_BITS of=$TEST_DATA bs=28k count=1 > /dev/null 2>&1
 
 touch $TMPFILE
-$MKE2FS -Fq -t ext4 -O bigalloc $TMPFILE 1M > /dev/null 2>&1
+$MKE2FS -Fq -t ext4 -o Linux -O bigalloc $TMPFILE 1M > /dev/null 2>&1
 $DEBUGFS -w $TMPFILE << EOF > /dev/null 2>&1
 write $TEST_DATA testfile
 set_inode_field testfile links_count 0

diff --git a/tests/f_dup_resize/script b/tests/f_dup_resize/script
index 52a1aed7ea9dc1ab2dc5f8a0b3f8f97d38d80e09..0fd350bf3fec558c0c9f55df2aa6437d5402c3c5 100644 (file)
--- a/tests/f_dup_resize/script
+++ b/tests/f_dup_resize/script
@@ -9,7 +9,7 @@ TEST_DATA="$test_name.tmp"
 dd if=$TEST_BITS of=$TEST_DATA bs=63k count=1 conv=sync > /dev/null 2>&1
 
 touch $TMPFILE
-$MKE2FS -F -O resize_inode $TMPFILE 10240 > /dev/null 2>&1
+$MKE2FS -F -o Linux -O resize_inode $TMPFILE 10240 > /dev/null 2>&1
 $DEBUGFS -w $TMPFILE << EOF > /dev/null 2>&1
 freeb 4 4
 freeb 8195 4

diff --git a/tests/f_extent_oobounds/script b/tests/f_extent_oobounds/script
index 9c6117c082a1d487862edb4f47a0f61e7710c445..9c2f667b47bf73aeddb7f3af07a64c0a3180025d 100644 (file)
--- a/tests/f_extent_oobounds/script
+++ b/tests/f_extent_oobounds/script
@@ -7,7 +7,7 @@ SKIP_GUNZIP="true"
 TEST_DATA="$test_name.tmp"
 
 dd if=/dev/zero of=$TMPFILE bs=1k count=256 > /dev/null 2>&1
-$MKE2FS -Ft ext4 $TMPFILE > /dev/null 2>&1
+$MKE2FS -Ft ext4 -o Linux $TMPFILE > /dev/null 2>&1
 $DEBUGFS -w $TMPFILE << EOF  > /dev/null 2>&1
 write /dev/null testfile
 setb 100 15

diff --git a/tests/f_opt_extent/script b/tests/f_opt_extent/script
index 836698376f8b3f527ca171227ac1d57c485212f7..001c727da413e40863693d425da61b50a2fefde0 100644 (file)
--- a/tests/f_opt_extent/script
+++ b/tests/f_opt_extent/script
@@ -21,7 +21,7 @@ ENDL
 
 echo "tune2fs metadata_csum test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/f_opt_extent_ext3/script b/tests/f_opt_extent_ext3/script
index 51fbceef0b86a695caac10a0ca5ba0d7bf36eb2d..ef8c906e4297d9dd48d98b3d243b3eb8dc012d62 100644 (file)
--- a/tests/f_opt_extent_ext3/script
+++ b/tests/f_opt_extent_ext3/script
@@ -22,7 +22,7 @@ ENDL
 
 echo "rebuild extent metadata_csum test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/m_bigjournal/script b/tests/m_bigjournal/script
index 96ea082ebe036b60b840f77706d9aff11b9aa452..8c09bc056fdc80f2bcce2f2599b6e0b7a4a2bdf5 100644 (file)
--- a/tests/m_bigjournal/script
+++ b/tests/m_bigjournal/script
@@ -3,9 +3,10 @@ FS_SIZE=11000000
 DUMPE2FS_IGNORE_80COL=1
 export DUMPE2FS_IGNORE_80COL
 MKE2FS_OPTS="-t ext4 -G 512 -N 1280 -J size=5000 -q -E lazy_journal_init,lazy_itable_init,nodiscard"
-if [ $(uname -s) = "Darwin" ]; then
+os=$(uname -s)
+if [ "$os" = "Darwin" -o "$os" = "GNU" ]; then
        # creates a 44GB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for HFS+ (no sparse files)"
+       echo "$test_name: $DESCRIPTION: skipped for $os"
        return 0
 fi
 . $cmd_dir/run_mke2fs

diff --git a/tests/m_hugefile/script b/tests/m_hugefile/script
index 1abdb7de42a594ff8772696ce2b73320d0cfe0dd..fc1d1155b6c87cc6f49af4c41f66fc50fb4bffae 100644 (file)
--- a/tests/m_hugefile/script
+++ b/tests/m_hugefile/script
@@ -3,15 +3,10 @@ OUT=$test_name.log
 EXP=$test_dir/expect
 CONF=$TMPFILE.conf
 
-if [ $(uname -s) = "Darwin" ]; then
-       # creates a 4TB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for HFS+ (no sparse files)"
-       return 0
-fi
-
-if [ $(uname -s) = "FreeBSD" ]; then
-       # creates a 4TB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for FreeBSD (no sparse files)"
+os=$(uname -s)
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
+       # creates a 44GB filesystem
+       echo "$test_name: $test_description: skipped for $os"
        return 0
 fi
 

diff --git a/tests/r_32to64bit/script b/tests/r_32to64bit/script
index 47ca9ea6a62d60bfd07bd8fda89ae9ff72e9641d..40b8088f1cb7382e64d5d0f475aea562fe472bc1 100644 (file)
--- a/tests/r_32to64bit/script
+++ b/tests/r_32to64bit/script
@@ -26,7 +26,7 @@ ENDL
 
 echo "resize2fs test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/r_32to64bit_meta/script b/tests/r_32to64bit_meta/script
index 5bf649fef235d44855ee1637b22036a8e3182c15..20106fd543c9ffd8e6a626c679cfd59128e70cd3 100644 (file)
--- a/tests/r_32to64bit_meta/script
+++ b/tests/r_32to64bit_meta/script
@@ -26,7 +26,7 @@ ENDL
 
 echo "resize2fs test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/r_32to64bit_move_itable/script b/tests/r_32to64bit_move_itable/script
index c0b3e94116c46c04bb37964998c4e35c764283ad..07489865b9da4ac6452eef8794c7b790b9106c39 100644 (file)
--- a/tests/r_32to64bit_move_itable/script
+++ b/tests/r_32to64bit_move_itable/script
@@ -26,7 +26,7 @@ ENDL
 
 echo "resize2fs test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 786432 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 786432 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/r_64bit_big_expand/script b/tests/r_64bit_big_expand/script
index 3e5bdf251e1cca703a4d98fc7b400c57d3cea509..d1bf8cdbbb8d3d22db7b1b2847b8b45e65e1eae1 100644 (file)
--- a/tests/r_64bit_big_expand/script
+++ b/tests/r_64bit_big_expand/script
@@ -10,9 +10,10 @@ SIZE_2=2T
 LOG=$test_name.log
 E2FSCK=../e2fsck/e2fsck
 
-if [ $(uname -s) = "FreeBSD" ]; then
+os=$(uname -s)
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
        # creates a 2TB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for FreeBSD"
+       echo "$test_name: $test_description: skipped for $os"
        return 0
 fi
 

diff --git a/tests/r_64to32bit/script b/tests/r_64to32bit/script
index a9818355b439c4ffbc346d755a4367370c321a00..df2b545c8dab42fd7db61ac4f0bce88c6bd4aedd 100644 (file)
--- a/tests/r_64to32bit/script
+++ b/tests/r_64to32bit/script
@@ -26,7 +26,7 @@ ENDL
 
 echo "resize2fs test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/r_64to32bit_meta/script b/tests/r_64to32bit_meta/script
index 9553e32c2680664e1fd831ad2243be660928ba62..5ee9f02b4219ff9d293070f5c094cb400642647b 100644 (file)
--- a/tests/r_64to32bit_meta/script
+++ b/tests/r_64to32bit_meta/script
@@ -26,7 +26,7 @@ ENDL
 
 echo "resize2fs test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/r_bigalloc_big_expand/script b/tests/r_bigalloc_big_expand/script
index ac29e92089d73a0e33d0203714d90a8cfa51afcd..101aafba0e9128fe3b7e930d051216652dfaaaa6 100644 (file)
--- a/tests/r_bigalloc_big_expand/script
+++ b/tests/r_bigalloc_big_expand/script
@@ -11,9 +11,10 @@ LOG=$test_name.log
 E2FSCK=../e2fsck/e2fsck
 RESIZE2FS_OPTS=-f
 
-if [ $(uname -s) = "FreeBSD" ]; then
+os=$(uname -s)
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
        # creates a 2TB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for FreeBSD"
+       echo "$test_name: $test_description: skipped for $os"
        return 0
 fi
 

diff --git a/tests/r_ext4_big_expand/script b/tests/r_ext4_big_expand/script
index c081d4473d02b88f4d9193dd2dfc67ddc901a659..a49e4c3a251965fe1d2999706c819e052fe8c753 100644 (file)
--- a/tests/r_ext4_big_expand/script
+++ b/tests/r_ext4_big_expand/script
@@ -10,9 +10,10 @@ SIZE_2=2T
 LOG=$test_name.log
 E2FSCK=../e2fsck/e2fsck
 
-if [ $(uname -s) = "FreeBSD" ]; then
+os=$(uname -s)
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
        # creates a 2TB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for FreeBSD"
+       echo "$test_name: $test_description: skipped for FreeBSD"
        return 0
 fi
 

diff --git a/tests/r_fixup_lastbg/script b/tests/r_fixup_lastbg/script
index 9fc0ec5a84c5fd2f76ad8913805574779ef1dad9..2a54aa7a0036a9cee43855b43051683ad14a0eef 100755 (executable)
--- a/tests/r_fixup_lastbg/script
+++ b/tests/r_fixup_lastbg/script
@@ -8,7 +8,7 @@ EXP=$test_dir/expect
 OUT=$test_name.log
 E2FSCK=../e2fsck/e2fsck
 
-$MKE2FS -T ext4 -b 1024 -F -U 56d3ee50-8532-4f29-8181-d7c6ea4a94a6 $TMPFILE 20000 > $OUT 2>&1
+$MKE2FS -T ext4 -o Linux -b 1024 -F -U 56d3ee50-8532-4f29-8181-d7c6ea4a94a6 $TMPFILE 20000 > $OUT 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | grep -A10 '^Group 2:' >> $OUT
 $DEBUGFS -R "set_bg 2 itable_unused 0" -w $TMPFILE > /dev/null 2>&1
 $DEBUGFS -R "set_bg 2 flags 0" -w $TMPFILE > /dev/null 2>&1

diff --git a/tests/r_fixup_lastbg_big/script b/tests/r_fixup_lastbg_big/script
index ea169e66b6f868e465c63832ce5fdd9671083b63..c13f731041e1dffb43e35d16c0763fa05bb939d8 100755 (executable)
--- a/tests/r_fixup_lastbg_big/script
+++ b/tests/r_fixup_lastbg_big/script
@@ -8,7 +8,7 @@ EXP=$test_dir/expect
 OUT=$test_name.log
 E2FSCK=../e2fsck/e2fsck
 
-$MKE2FS -T ext4 -b 1024 -F -U 56d3ee50-8532-4f29-8181-d7c6ea4a94a6 $TMPFILE 20000 > $OUT 2>&1
+$MKE2FS -T ext4 -o Linux -b 1024 -F -U 56d3ee50-8532-4f29-8181-d7c6ea4a94a6 $TMPFILE 20000 > $OUT 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | grep -A10 '^Group 2:' >> $OUT
 $DEBUGFS -R "set_bg 2 itable_unused 0" -w $TMPFILE > /dev/null 2>&1
 $DEBUGFS -R "set_bg 2 flags 0" -w $TMPFILE > /dev/null 2>&1

diff --git a/tests/r_move_itable_nostride/script b/tests/r_move_itable_nostride/script
index 08940f61db32b8335e0fd84fdc6361596ba8f5dd..d24df22a6fa3463706f258d3d2ec6e5b0976442f 100644 (file)
--- a/tests/r_move_itable_nostride/script
+++ b/tests/r_move_itable_nostride/script
@@ -1,12 +1,7 @@
-if [ $(uname -s) = "FreeBSD" ]; then
-       # creates a 96GB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for FreeBSD (no sparse files)"
-       return 0
-fi
-
-if [ $(uname -s) = "Darwin" ]; then
+os=$(uname -s)
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
        # creates a 96GB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for HFS+ (no sparse files)"
+       echo "$test_name: $test_description: skipped for $os"
        return 0
 fi
 

diff --git a/tests/r_move_itable_realloc/script b/tests/r_move_itable_realloc/script
index ae875e4ac7ce11ec6acf7ba5cce2ccd053262a3d..20c26dbd9a9c38ca9367cacb474509bea18f89f4 100644 (file)
--- a/tests/r_move_itable_realloc/script
+++ b/tests/r_move_itable_realloc/script
@@ -1,12 +1,7 @@
-if [ $(uname -s) = "FreeBSD" ]; then
-       # creates a 96GB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for FreeBSD (no sparse files)"
-       return 0
-fi
-
-if [ $(uname -s) = "Darwin" ]; then
+os=$(uname -s)
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
        # creates a 96GB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for HFS+ (no sparse files)"
+       echo "$test_name: $test_description: skipped: skipped for $os"
        return 0
 fi
 

diff --git a/tests/t_change_uuid_mcsum/script b/tests/t_change_uuid_mcsum/script
index 36585946e440cff60fd5c3f2a39084fdfe406b16..4ec57767b34c2333c6823e0df40c806040a56e96 100755 (executable)
--- a/tests/t_change_uuid_mcsum/script
+++ b/tests/t_change_uuid_mcsum/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs with metadata_csum" >> $OUT
-$MKE2FS -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "change UUID" >> $OUT

diff --git a/tests/t_change_uuid_mcsum_mounted/script b/tests/t_change_uuid_mcsum_mounted/script
index 5a534a0db3e8dab1cb5ce6af291f34c9846ddfdb..f94bfbbe3bbde03e2d80f3ab903d6ad90985e026 100755 (executable)
--- a/tests/t_change_uuid_mcsum_mounted/script
+++ b/tests/t_change_uuid_mcsum_mounted/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs with metadata_csum" >> $OUT
-$MKE2FS -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "change UUID" >> $OUT

diff --git a/tests/t_change_uuid_mcsum_seed_mounted/script b/tests/t_change_uuid_mcsum_seed_mounted/script
index c827325d17b92a2c281d9763e8a9a23b07602edc..19fdbed97dd4765738b5913b1a6310d57ec182d3 100755 (executable)
--- a/tests/t_change_uuid_mcsum_seed_mounted/script
+++ b/tests/t_change_uuid_mcsum_seed_mounted/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs with metadata_csum" >> $OUT
-$MKE2FS -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "change UUID" >> $OUT

diff --git a/tests/t_dangerous/script b/tests/t_dangerous/script
index f684d56d3e6fc9e1f78eda234737956e5b5e9654..a6d3dc42e8c541ba7c2ed92f9a63eb26f545ba24 100644 (file)
--- a/tests/t_dangerous/script
+++ b/tests/t_dangerous/script
@@ -33,7 +33,7 @@ ENDL
 
 echo "tune2fs dangerous prompts test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -U 6fc3daa4-180d-4f2b-a6f2-f7a5efb79bcf $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux -U 6fc3daa4-180d-4f2b-a6f2-f7a5efb79bcf $TMPFILE 524288 >> $OUT 2>&1
 
 # trigger a filesystem check
 $DEBUGFS -w -R 'ssv mtime now' $TMPFILE > /dev/null 2>&1
@@ -54,7 +54,7 @@ $TUNE2FS -O metadata_csum $TMPFILE >> $OUT 2>&1
 status=$?
 echo Exit status is $status >> $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -U 6fc3daa4-180d-4f2b-a6f2-f7a5efb79bcf $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux -U 6fc3daa4-180d-4f2b-a6f2-f7a5efb79bcf $TMPFILE 524288 >> $OUT 2>&1
 
 # dump and check
 $DUMPE2FS $TMPFILE 2> /dev/null | grep '^Group 0:' -B99 -A20 | sed -f $cmd_dir/filter.sed > $OUT.before
@@ -120,7 +120,7 @@ echo Exit status is $status >> $OUT
 echo " " >> $OUT
 echo "Testing with metadata checksum enabled" >> $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4m -U 6fc3daa4-180d-4f2b-a6f2-f7a5efb79bcf $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4m -o Linux -U 6fc3daa4-180d-4f2b-a6f2-f7a5efb79bcf $TMPFILE 524288 >> $OUT 2>&1
 $DUMPE2FS $TMPFILE 2> /dev/null | grep '^Group 0:' -B99 -A20 | sed -f $cmd_dir/filter.sed > $OUT.before
 $FSCK $FSCK_OPT -f -N test_filesys $TMPFILE >> $OUT 2>&1
 status=$?

diff --git a/tests/t_disable_changed_csum_seed/script b/tests/t_disable_changed_csum_seed/script
index f7211441a6f738bcf0fa6ab27ace4e03025f9521..449689a9e6aff0045a950b04dd0ee58723d2c812 100755 (executable)
--- a/tests/t_disable_changed_csum_seed/script
+++ b/tests/t_disable_changed_csum_seed/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT
-$MKE2FS -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "turn on csum_seed" >> $OUT

diff --git a/tests/t_disable_changed_csum_seed_mounted/script b/tests/t_disable_changed_csum_seed_mounted/script
index 229d6eeaaa165f790817fb4baa40b20b2420623e..ea2184f49c0fefbc2c7dcfd7564ff8bf1c7989d0 100755 (executable)
--- a/tests/t_disable_changed_csum_seed_mounted/script
+++ b/tests/t_disable_changed_csum_seed_mounted/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT
-$MKE2FS -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "turn on csum_seed" >> $OUT

diff --git a/tests/t_disable_csum_seed/script b/tests/t_disable_csum_seed/script
index cb1cbc67e4b6e0046ba7fffe0b98cfd2d01d2367..e762ad4eef8e03bc72e1154140b4e853f0074fc9 100755 (executable)
--- a/tests/t_disable_csum_seed/script
+++ b/tests/t_disable_csum_seed/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT
-$MKE2FS -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "turn on csum_seed" >> $OUT

diff --git a/tests/t_disable_mcsum/script b/tests/t_disable_mcsum/script
index 7f1b3b48edc31098f8f3a2f69b39ad032087a4ff..117969d8dc8ea0b50501cbaca65904ca5c56c1fd 100644 (file)
--- a/tests/t_disable_mcsum/script
+++ b/tests/t_disable_mcsum/script
@@ -21,7 +21,7 @@ ENDL
 
 echo "tune2fs ^metadata_csum test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -rf $CONF
 
 # dump and check

diff --git a/tests/t_disable_mcsum_noinitbg/script b/tests/t_disable_mcsum_noinitbg/script
index 70f40a945e1f44ccc524e12ba5be345d368d2ad6..bc2bad75f0a88278bac3e67d194047bacfc74f40 100644 (file)
--- a/tests/t_disable_mcsum_noinitbg/script
+++ b/tests/t_disable_mcsum_noinitbg/script
@@ -21,7 +21,7 @@ ENDL
 
 echo "tune2fs ^metadata_csum test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/t_disable_mcsum_yesinitbg/script b/tests/t_disable_mcsum_yesinitbg/script
index 1f260b8e1594287b2ea6f831102568e0c3225641..8fadc5774ad9ecec7d5b495c308d0b9a80cae5c3 100644 (file)
--- a/tests/t_disable_mcsum_yesinitbg/script
+++ b/tests/t_disable_mcsum_yesinitbg/script
@@ -21,7 +21,7 @@ ENDL
 
 echo "tune2fs ^metadata_csum test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux $TMPFILE 524288 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/t_disable_meta_csum_and_seed/script b/tests/t_disable_meta_csum_and_seed/script
index 20e52ac84be99ced477c7314fde604a0ed955468..52d7f621326baa084ecec5967b07d5355d4af044 100755 (executable)
--- a/tests/t_disable_meta_csum_and_seed/script
+++ b/tests/t_disable_meta_csum_and_seed/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT
-$MKE2FS -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "turn on csum_seed" >> $OUT

diff --git a/tests/t_enable_csum_seed/script b/tests/t_enable_csum_seed/script
index 5eff077a5a1dc86e1faafc62dd244951759d2096..78ccbeb2fafb0292bf637c8121290f12a40fa6fe 100755 (executable)
--- a/tests/t_enable_csum_seed/script
+++ b/tests/t_enable_csum_seed/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs without csum_seed" >> $OUT
-$MKE2FS -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,^metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "turn on csum_seed" >> $OUT

diff --git a/tests/t_enable_mcsum/script b/tests/t_enable_mcsum/script
index 5239eb396675a57d057d3ff134ceaed963171995..3a5409b5ab52a54bc361dad3e8a7aed6a0a1eae3 100644 (file)
--- a/tests/t_enable_mcsum/script
+++ b/tests/t_enable_mcsum/script
@@ -21,7 +21,7 @@ ENDL
 
 echo "tune2fs metadata_csum test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -o Linux -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
 rm -rf $CONF
 
 # dump and check

diff --git a/tests/t_enable_mcsum_ext3/script b/tests/t_enable_mcsum_ext3/script
index ac6386639038afe8f781160022690164c3b820a7..c008c0abfc1a2be6cb528690cb73987248053071 100644 (file)
--- a/tests/t_enable_mcsum_ext3/script
+++ b/tests/t_enable_mcsum_ext3/script
@@ -21,7 +21,7 @@ ENDL
 
 echo "tune2fs metadata_csum test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -o Linux -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
 rm -rf $CONF
 
 # dump and check

diff --git a/tests/t_enable_mcsum_initbg/script b/tests/t_enable_mcsum_initbg/script
index 35c45414f82ca23dddf1cfa72dad8013e4cc2f6d..975b0f3419c6922eaf9f7d8d206515e8e5fc4e56 100644 (file)
--- a/tests/t_enable_mcsum_initbg/script
+++ b/tests/t_enable_mcsum_initbg/script
@@ -21,7 +21,7 @@ ENDL
 
 echo "tune2fs metadata_csum test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -o Linux -F -T ext4h $TMPFILE 524288 >> $OUT 2>&1
 rm -rf $CONF
 
 # dump and check

diff --git a/tests/t_format_csum_seed/script b/tests/t_format_csum_seed/script
index 882e8eb774c9a916015bb21ff0ce9c34f8e3f147..3038785ec79198d5fcc3a5b7f94c041028135fa8 100755 (executable)
--- a/tests/t_format_csum_seed/script
+++ b/tests/t_format_csum_seed/script
@@ -8,7 +8,7 @@ rm -f $OUT
 
 # Test command line option
 echo "create fs with csum_seed" >> $OUT
-$MKE2FS -O metadata_csum,metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
+$MKE2FS -o Linux -O metadata_csum,metadata_csum_seed -U 6b33f586-a183-4383-921d-30da3fef2e5c -F $TMPFILE > /dev/null 2>&1
 $DUMPE2FS $TMPFILE 2>&1 | egrep '(Checksum seed:|UUID)' >> $OUT
 
 echo "change uuid" >> $OUT

diff --git a/tests/t_iexpand_full/script b/tests/t_iexpand_full/script
index bd0b7004006a8e4a0bd3cf17a44bfefc9356aa80..2d347c2355d3c35a72cdeacb1317a8457b1f646f 100644 (file)
--- a/tests/t_iexpand_full/script
+++ b/tests/t_iexpand_full/script
@@ -34,7 +34,7 @@ ENDL
 
 echo "tune2fs test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -I 128 $TMPFILE 786432 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux -I 128 $TMPFILE 786432 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/t_iexpand_mcsum/script b/tests/t_iexpand_mcsum/script
index 32c8d0e440afe6766ced29d6e5f67634cbf66568..9ee75cfb50f29aee07ae9f2856b266ebadd6064d 100644 (file)
--- a/tests/t_iexpand_mcsum/script
+++ b/tests/t_iexpand_mcsum/script
@@ -34,7 +34,7 @@ ENDL
 
 echo "tune2fs test" > $OUT
 
-MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -I 128 $TMPFILE 786432 >> $OUT 2>&1
+MKE2FS_CONFIG=$CONF $MKE2FS -F -T ext4h -o Linux -I 128 $TMPFILE 786432 >> $OUT 2>&1
 rm -f $CONF
 
 # dump and check

diff --git a/tests/t_uninit_bg_rm/script b/tests/t_uninit_bg_rm/script
index 7b95710dfb9b2677516faf8c42b3fb42ebe25f2e..66eb21c76c4b3cb8b5cda3678dde2c028b2c25f5 100644 (file)
--- a/tests/t_uninit_bg_rm/script
+++ b/tests/t_uninit_bg_rm/script
@@ -3,9 +3,10 @@ OUT=$test_name.log
 FSCK_OPT=-yf
 EXP=$test_dir/expect
 
-if [ $(uname -s) = "Darwin" ]; then
+os=$(uname -s)
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
        # creates a 10GB filesystem
-       echo "$test_name: $DESCRIPTION: skipped for HFS+ (no sparse files)"
+       echo "$test_name: $test_description: skipped for $os"
        return 0
 fi