[PATCH 4/5] btrfs-progs: misc-tests: Make test cases work or skipped on 64K page size system

Qu Wenruo
2019-07-05T07:27:12Z

[BUG]
The following test cases fails on aarch64 64K page size mode:
[TEST/misc] 010-convert-delete-ext2-subvol
failed: mount -t btrfs -o loop /home/adam/btrfs-progs/tests//test.img /home/adam/btrfs-progs/tests//mnt
test failed for case 010-convert-delete-ext2-subvol
make: *** [Makefile:387: test-misc] Error 1

[CAUSE]
Most of them are caused by the lack of subpage sized sector size
support.
Or the conflicts sector size (64K) and nodesize (smaller than 64K).

[FIX]
Check if the current kernel accepts subpage sized sector size and
manually specify 4K sector size.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
tests/misc-tests/010-convert-delete-ext2-subvol/test.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
index 5f441a7f5eb9..aa741e7aca7f 100755
--- a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
+++ b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
@@ -7,12 +7,15 @@ source "$TEST_TOP/common"

check_prereq btrfs-convert
check_prereq btrfs
+check_global_prereq getconf
+
+page_size=$(getconf PAGESIZE)

setup_root_helper
prepare_test_dev

run_check truncate -s 2G "$TEST_DEV"
-run_check mkfs.ext4 -F "$TEST_DEV"
+run_check mkfs.ext4 -F "$TEST_DEV" -b $page_size
run_check "$TOP/btrfs-convert" "$TEST_DEV"
run_check $SUDO_HELPER "$TOP/btrfs" inspect-internal dump-tree "$TEST_DEV"
run_check_mount_test_dev
--
2.22.0