As now btrfs-convert is forced to used mixed block group, only test pagesize as nodesize for convert.
Signed-off-by: Qu Wenruo <quwen...@cn.fujitsu.com> --- tests/convert-tests.sh | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh index 68c03dc..f6f4679 100755 --- a/tests/convert-tests.sh +++ b/tests/convert-tests.sh @@ -57,19 +57,25 @@ if ! [ -z "$TEST" ]; then fi for feature in '' 'extref' 'skinny-metadata' 'no-holes'; do - convert_test "$feature" "ext2 4k nodesize" 4096 mke2fs -b 4096 - convert_test "$feature" "ext3 4k nodesize" 4096 mke2fs -j -b 4096 - convert_test "$feature" "ext4 4k nodesize" 4096 mke2fs -t ext4 -b 4096 - convert_test "$feature" "ext2 8k nodesize" 8192 mke2fs -b 4096 - convert_test "$feature" "ext3 8k nodesize" 8192 mke2fs -j -b 4096 - convert_test "$feature" "ext4 8k nodesize" 8192 mke2fs -t ext4 -b 4096 - convert_test "$feature" "ext2 16k nodesize" 16384 mke2fs -b 4096 - convert_test "$feature" "ext3 16k nodesize" 16384 mke2fs -j -b 4096 - convert_test "$feature" "ext4 16k nodesize" 16384 mke2fs -t ext4 -b 4096 - convert_test "$feature" "ext2 32k nodesize" 32768 mke2fs -b 4096 - convert_test "$feature" "ext3 32k nodesize" 32768 mke2fs -j -b 4096 - convert_test "$feature" "ext4 32k nodesize" 32768 mke2fs -t ext4 -b 4096 - convert_test "$feature" "ext2 64k nodesize" 65536 mke2fs -b 4096 - convert_test "$feature" "ext3 64k nodesize" 65536 mke2fs -j -b 4096 - convert_test "$feature" "ext4 64k nodesize" 65536 mke2fs -t ext4 -b 4096 + # Btrfs-convert is forced to use mixed-bg, so must use pagesize + # for nodesize right now + nodesize=`getconf PAGESIZE` + convert_test "$feature" "ext2 4k nodesize" $nodesize mke2fs -b 4096 + convert_test "$feature" "ext3 4k nodesize" $nodesize mke2fs -b 4096 + convert_test "$feature" "ext4 4k nodesize" $nodesize mke2fs -b 4096 +# convert_test "$feature" "ext2 4k nodesize" 4096 mke2fs -b 4096 +# convert_test "$feature" "ext3 4k nodesize" 4096 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 4k nodesize" 4096 mke2fs -t ext4 -b 4096 +# convert_test "$feature" "ext2 8k nodesize" 8192 mke2fs -b 4096 +# convert_test "$feature" "ext3 8k nodesize" 8192 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 8k nodesize" 8192 mke2fs -t ext4 -b 4096 +# convert_test "$feature" "ext2 16k nodesize" 16384 mke2fs -b 4096 +# convert_test "$feature" "ext3 16k nodesize" 16384 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 16k nodesize" 16384 mke2fs -t ext4 -b 4096 +# convert_test "$feature" "ext2 32k nodesize" 32768 mke2fs -b 4096 +# convert_test "$feature" "ext3 32k nodesize" 32768 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 32k nodesize" 32768 mke2fs -t ext4 -b 4096 +# convert_test "$feature" "ext2 64k nodesize" 65536 mke2fs -b 4096 +# convert_test "$feature" "ext3 64k nodesize" 65536 mke2fs -j -b 4096 +# convert_test "$feature" "ext4 64k nodesize" 65536 mke2fs -t ext4 -b 4096 done -- 2.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
