From 7299e0d294c0846da0af46775713f3697bfc3bcf Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 7 Sep 2017 14:44:45 +0200 Subject: btrfs-progs: tests: enhance post-rollback fsck tests The post-rollback helper still assumes just extN, we need an extra argument that'll get passed to fsck. Change all callsites at once so the tests do not fail temporarily. Signed-off-by: David Sterba --- tests/common.convert | 16 ++++++++++++++-- tests/convert-tests/005-delete-all-rollback/test.sh | 2 +- tests/convert-tests/008-readonly-image/test.sh | 2 +- tests/convert-tests/009-common-inode-flags/test.sh | 2 +- .../011-reiserfs-delete-all-rollback/test.sh | 2 +- .../013-reiserfs-common-inode-flags/test.sh | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/common.convert b/tests/common.convert index 1d98cda1..7d9a5be1 100644 --- a/tests/common.convert +++ b/tests/common.convert @@ -218,9 +218,21 @@ convert_test_post_checks_all() { } # do rollback and fsck +# $1: filesystem name or alias (ext2 includes ext3 and ext4), convert_test_post_rollback() { + local types + run_check "$TOP/btrfs-convert" --rollback "$TEST_DEV" - run_check fsck -n -t ext2,ext3,ext4 "$TEST_DEV" + if [ -z "$1" ]; then + _fail "missing filesystem type to check" + fi + case "$1" in + ext[234]) types=ext2,ext3,ext4 ;; + reiserfs) types=reiserfs ;; + *) _fail "unknown filesystem type to check: $1" ;; + esac + + run_check fsck -n -t "$types" "$TEST_DEV" } # simple wrapper for a convert test @@ -261,5 +273,5 @@ convert_test() { rm -- "$EXT_PERMTMP" rm -- "$EXT_ACLTMP" - convert_test_post_rollback + convert_test_post_rollback "$fstype" } diff --git a/tests/convert-tests/005-delete-all-rollback/test.sh b/tests/convert-tests/005-delete-all-rollback/test.sh index 316d57a0..19aa76d4 100755 --- a/tests/convert-tests/005-delete-all-rollback/test.sh +++ b/tests/convert-tests/005-delete-all-rollback/test.sh @@ -46,7 +46,7 @@ do_test() { cd "$here" run_check "$TOP/btrfs" filesystem sync "$TEST_MNT" run_check_umount_test_dev - convert_test_post_rollback + convert_test_post_rollback ext4 run_check_mount_convert_dev ext4 convert_test_post_check_checksums "$CHECKSUMTMP" diff --git a/tests/convert-tests/008-readonly-image/test.sh b/tests/convert-tests/008-readonly-image/test.sh index 73c9eff2..8551fb9b 100755 --- a/tests/convert-tests/008-readonly-image/test.sh +++ b/tests/convert-tests/008-readonly-image/test.sh @@ -24,4 +24,4 @@ if [ $? -ne 1 ]; then exit 1 fi run_check_umount_test_dev -convert_test_post_rollback +convert_test_post_rollback ext4 diff --git a/tests/convert-tests/009-common-inode-flags/test.sh b/tests/convert-tests/009-common-inode-flags/test.sh index 1f3106b4..cd7b5111 100755 --- a/tests/convert-tests/009-common-inode-flags/test.sh +++ b/tests/convert-tests/009-common-inode-flags/test.sh @@ -34,4 +34,4 @@ if [ $? -ne 0 ]; then fi run_check_umount_test_dev -convert_test_post_rollback +convert_test_post_rollback ext4 diff --git a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh index 8c1b8057..98dc5d69 100755 --- a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh +++ b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh @@ -45,7 +45,7 @@ do_test() { cd "$here" run_check "$TOP/btrfs" filesystem sync "$TEST_MNT" run_check_umount_test_dev - convert_test_post_rollback + convert_test_post_rollback reiserfs run_check_mount_convert_dev reiserfs convert_test_post_check_checksums "$CHECKSUMTMP" diff --git a/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh b/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh index ba160262..d620a055 100755 --- a/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh +++ b/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh @@ -35,4 +35,4 @@ if [ $? -ne 0 ]; then fi run_check_umount_test_dev -convert_test_post_rollback +convert_test_post_rollback reiserfs -- cgit v1.2.3