From 362936b03e61e9d68ef9c6620b1d1dd1fdbcf705 Mon Sep 17 00:00:00 2001 From: Sebastian Thorarensen Date: Fri, 20 Mar 2015 02:11:29 +0100 Subject: [PATCH] btrfs-progs: Add nodesize test for btrfs-convert convert-tests now test both 4096 and 16384 nodesizes. Signed-off-by: Sebastian Thorarensen Signed-off-by: David Sterba --- tests/convert-tests.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh index 6094287b..3d912f34 100644 --- a/tests/convert-tests.sh +++ b/tests/convert-tests.sh @@ -16,7 +16,8 @@ rm -f convert-tests-results.txt test(){ echo " [TEST] $1" - shift + nodesize=$2 + shift 2 echo "creating ext image with: $*" >> convert-tests-results.txt # 256MB is the smallest acceptable btrfs image. rm -f $here/test.img >> convert-tests-results.txt 2>&1 \ @@ -25,13 +26,17 @@ test(){ || _fail "could not create test image file" $* -F $here/test.img >> convert-tests-results.txt 2>&1 \ || _fail "filesystem create failed" - $here/btrfs-convert $here/test.img >> convert-tests-results.txt 2>&1 \ + $here/btrfs-convert -N "$nodesize" $here/test.img \ + >> convert-tests-results.txt 2>&1 \ || _fail "btrfs-convert failed" $here/btrfs check $here/test.img >> convert-tests-results.txt 2>&1 \ || _fail "btrfs check detected errors" } # btrfs-convert requires 4k blocksize. -test "ext2" mke2fs -b 4096 -test "ext3" mke2fs -j -b 4096 -test "ext4" mke2fs -t ext4 -b 4096 +test "ext2 4k nodesize" 4096 mke2fs -b 4096 +test "ext3 4k nodesize" 4096 mke2fs -j -b 4096 +test "ext4 4k nodesize" 4096 mke2fs -t ext4 -b 4096 +test "ext2 16k nodesize" 16384 mke2fs -b 4096 +test "ext3 16k nodesize" 16384 mke2fs -j -b 4096 +test "ext4 16k nodesize" 16384 mke2fs -t ext4 -b 4096