diff options
author | Theodore Ts'o <tytso@mit.edu> | 2021-07-29 10:31:53 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2021-07-29 10:31:53 -0400 |
commit | 5a3ea3905f1832441c40d1a983ba85245d1a9fca (patch) | |
tree | 345d504f874d16459baacb29e92a997f91285808 | |
parent | 4d988e1bba91d6a69d4c34c709084e0e39cb6b2c (diff) | |
download | e2fsprogs-5a3ea3905f1832441c40d1a983ba85245d1a9fca.tar.gz |
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>
39 files changed, 58 insertions, 68 deletions
diff --git a/tests/f_bigalloc_badinode/script b/tests/f_bigalloc_badinode/script index c1dd45461..6ceb6ee41 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 b48d5c0d5..8a062dc1d 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 52a1aed7e..0fd350bf3 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 9c6117c08..9c2f667b4 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 836698376..001c727da 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 51fbceef0..ef8c906e4 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 96ea082eb..8c09bc056 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 1abdb7de4..fc1d1155b 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 47ca9ea6a..40b8088f1 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 5bf649fef..20106fd54 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 c0b3e9411..07489865b 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 3e5bdf251..d1bf8cdbb 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 a9818355b..df2b545c8 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 9553e32c2..5ee9f02b4 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 ac29e9208..101aafba0 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 c081d4473..a49e4c3a2 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 9fc0ec5a8..2a54aa7a0 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 ea169e66b..c13f73104 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 08940f61d..d24df22a6 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 ae875e4ac..20c26dbd9 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 36585946e..4ec57767b 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 5a534a0db..f94bfbbe3 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 c827325d1..19fdbed97 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 f684d56d3..a6d3dc42e 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 f7211441a..449689a9e 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 229d6eeaa..ea2184f49 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 cb1cbc67e..e762ad4ee 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 7f1b3b48e..117969d8d 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 70f40a945..bc2bad75f 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 1f260b8e1..8fadc5774 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 20e52ac84..52d7f6213 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 5eff077a5..78ccbeb2f 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 5239eb396..3a5409b5a 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 ac6386639..c008c0abf 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 35c45414f..975b0f341 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 882e8eb77..3038785ec 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 bd0b70040..2d347c235 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 32c8d0e44..9ee75cfb5 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 7b95710df..66eb21c76 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 |