btrfs-progs: tests: fix filesytem type creation for convert tests

The extN filesystem type was lost when the separate tests were created
and we've been testing only ext2. The tests pass for ext3 and ext4
though.

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/tests/convert-tests/002-ext3-basic/test.sh b/tests/convert-tests/002-ext3-basic/test.sh
index 6435630..aeb111e 100755 (executable)
--- a/tests/convert-tests/002-ext3-basic/test.sh
+++ b/tests/convert-tests/002-ext3-basic/test.sh
@@ -8,9 +8,9 @@ prepare_test_dev 512M
 check_prereq btrfs-convert
 
 for feature in '' 'extref' 'skinny-metadata' 'no-holes'; do
-       convert_test "$feature" "ext3 4k nodesize" 4096 mke2fs -b 4096
-       convert_test "$feature" "ext3 8k nodesize" 8192 mke2fs -b 4096
-       convert_test "$feature" "ext3 16k nodesize" 16384 mke2fs -b 4096
-       convert_test "$feature" "ext3 32k nodesize" 32768 mke2fs -b 4096
-       convert_test "$feature" "ext3 64k nodesize" 65536 mke2fs -b 4096
+       convert_test "$feature" "ext3 4k nodesize" 4096 mke2fs -j -b 4096
+       convert_test "$feature" "ext3 8k nodesize" 8192 mke2fs -j -b 4096
+       convert_test "$feature" "ext3 16k nodesize" 16384 mke2fs -j -b 4096
+       convert_test "$feature" "ext3 32k nodesize" 32768 mke2fs -j -b 4096
+       convert_test "$feature" "ext3 64k nodesize" 65536 mke2fs -j -b 4096
 done

diff --git a/tests/convert-tests/003-ext4-basic/test.sh b/tests/convert-tests/003-ext4-basic/test.sh
index 9a81a47..531c81b 100755 (executable)
--- a/tests/convert-tests/003-ext4-basic/test.sh
+++ b/tests/convert-tests/003-ext4-basic/test.sh
@@ -8,9 +8,9 @@ prepare_test_dev 512M
 check_prereq btrfs-convert
 
 for feature in '' 'extref' 'skinny-metadata' 'no-holes'; do
-       convert_test "$feature" "ext4 4k nodesize" 4096 mke2fs -b 4096
-       convert_test "$feature" "ext4 8k nodesize" 8192 mke2fs -b 4096
-       convert_test "$feature" "ext4 16k nodesize" 16384 mke2fs -b 4096
-       convert_test "$feature" "ext4 32k nodesize" 32768 mke2fs -b 4096
-       convert_test "$feature" "ext4 64k nodesize" 65536 mke2fs -b 4096
+       convert_test "$feature" "ext4 4k nodesize" 4096 mke2fs -t ext4 -b 4096
+       convert_test "$feature" "ext4 8k nodesize" 8192 mke2fs -t ext4 -b 4096
+       convert_test "$feature" "ext4 16k nodesize" 16384 mke2fs -t ext4 -b 4096
+       convert_test "$feature" "ext4 32k nodesize" 32768 mke2fs -t ext4 -b 4096
+       convert_test "$feature" "ext4 64k nodesize" 65536 mke2fs -t ext4 -b 4096
 done