From 5a3ea3905f1832441c40d1a983ba85245d1a9fca Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 29 Jul 2021 10:31:53 -0400
Subject: [PATCH] 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>
---
 tests/f_bigalloc_badinode/script                 |  2 +-
 tests/f_bigalloc_orphan_list/script              |  2 +-
 tests/f_dup_resize/script                        |  2 +-
 tests/f_extent_oobounds/script                   |  2 +-
 tests/f_opt_extent/script                        |  2 +-
 tests/f_opt_extent_ext3/script                   |  2 +-
 tests/m_bigjournal/script                        |  5 +++--
 tests/m_hugefile/script                          | 13 ++++---------
 tests/r_32to64bit/script                         |  2 +-
 tests/r_32to64bit_meta/script                    |  2 +-
 tests/r_32to64bit_move_itable/script             |  2 +-
 tests/r_64bit_big_expand/script                  |  5 +++--
 tests/r_64to32bit/script                         |  2 +-
 tests/r_64to32bit_meta/script                    |  2 +-
 tests/r_bigalloc_big_expand/script               |  5 +++--
 tests/r_ext4_big_expand/script                   |  5 +++--
 tests/r_fixup_lastbg/script                      |  2 +-
 tests/r_fixup_lastbg_big/script                  |  2 +-
 tests/r_move_itable_nostride/script              | 11 +++--------
 tests/r_move_itable_realloc/script               | 11 +++--------
 tests/t_change_uuid_mcsum/script                 |  2 +-
 tests/t_change_uuid_mcsum_mounted/script         |  2 +-
 tests/t_change_uuid_mcsum_seed_mounted/script    |  2 +-
 tests/t_dangerous/script                         |  6 +++---
 tests/t_disable_changed_csum_seed/script         |  2 +-
 tests/t_disable_changed_csum_seed_mounted/script |  2 +-
 tests/t_disable_csum_seed/script                 |  2 +-
 tests/t_disable_mcsum/script                     |  2 +-
 tests/t_disable_mcsum_noinitbg/script            |  2 +-
 tests/t_disable_mcsum_yesinitbg/script           |  2 +-
 tests/t_disable_meta_csum_and_seed/script        |  2 +-
 tests/t_enable_csum_seed/script                  |  2 +-
 tests/t_enable_mcsum/script                      |  2 +-
 tests/t_enable_mcsum_ext3/script                 |  2 +-
 tests/t_enable_mcsum_initbg/script               |  2 +-
 tests/t_format_csum_seed/script                  |  2 +-
 tests/t_iexpand_full/script                      |  2 +-
 tests/t_iexpand_mcsum/script                     |  2 +-
 tests/t_uninit_bg_rm/script                      |  5 +++--
 39 files changed, 58 insertions(+), 68 deletions(-)

diff --git a/tests/f_bigalloc_badinode/script b/tests/f_bigalloc_badinode/script
index c1dd454..6ceb6ee 100644
--- 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 b48d5c0..8a062dc 100644
--- 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 52a1aed..0fd350b 100644
--- 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 9c6117c..9c2f667 100644
--- 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 8366983..001c727 100644
--- 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 51fbcee..ef8c906 100644
--- 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 96ea082..8c09bc0 100644
--- 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 1abdb7d..fc1d115 100644
--- 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 47ca9ea..40b8088 100644
--- 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 5bf649f..20106fd 100644
--- 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 c0b3e94..0748986 100644
--- 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 3e5bdf2..d1bf8cd 100644
--- 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 a981835..df2b545 100644
--- 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 9553e32..5ee9f02 100644
--- 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 ac29e92..101aafb 100644
--- 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 c081d44..a49e4c3 100644
--- 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 9fc0ec5..2a54aa7 100755
--- 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 ea169e6..c13f731 100755
--- 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 08940f6..d24df22 100644
--- 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 ae875e4..20c26db 100644
--- 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 3658594..4ec5776 100755
--- 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 5a534a0..f94bfbb 100755
--- 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 c827325..19fdbed 100755
--- 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 f684d56..a6d3dc4 100644
--- 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 f721144..449689a 100755
--- 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 229d6ee..ea2184f 100755
--- 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 cb1cbc6..e762ad4 100755
--- 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 7f1b3b4..117969d 100644
--- 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 70f40a9..bc2bad7 100644
--- 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 1f260b8..8fadc57 100644
--- 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 20e52ac..52d7f62 100755
--- 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 5eff077..78ccbeb 100755
--- 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 5239eb3..3a5409b 100644
--- 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 ac63866..c008c0a 100644
--- 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 35c4541..975b0f3 100644
--- 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 882e8eb..3038785 100755
--- 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 bd0b700..2d347c2 100644
--- 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 32c8d0e..9ee75cf 100644
--- 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 7b95710..66eb21c 100644
--- 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
 
-- 
1.8.3.1