From a6e5cdef437ca9f47e70f928fa8c4338d2037ad5 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Fri, 27 Oct 2017 15:50:34 +0200 Subject: [PATCH] btrfs-progs: tests: don't pass size to prepare_test_dev if not necessary Most tests don't need a specific size of the test device, the default 2GiB should be fine. Signed-off-by: David Sterba --- tests/cli-tests/002-balance-full-no-filters/test.sh | 2 +- tests/cli-tests/004-send-parent-multi-subvol/test.sh | 2 +- tests/cli-tests/005-qgroup-show/test.sh | 2 +- tests/convert-tests/001-ext2-basic/test.sh | 2 +- tests/convert-tests/002-ext3-basic/test.sh | 2 +- tests/convert-tests/003-ext4-basic/test.sh | 2 +- tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh | 2 +- tests/convert-tests/005-delete-all-rollback/test.sh | 2 +- tests/convert-tests/006-large-hole-extent/test.sh | 2 +- tests/convert-tests/007-unsupported-block-sizes/test.sh | 2 +- tests/convert-tests/008-readonly-image/test.sh | 2 +- tests/convert-tests/009-common-inode-flags/test.sh | 2 +- tests/convert-tests/010-reiserfs-basic/test.sh | 2 +- tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh | 2 +- tests/convert-tests/012-reiserfs-large-hole-extent/test.sh | 2 +- tests/convert-tests/013-reiserfs-common-inode-flags/test.sh | 2 +- tests/convert-tests/014-reiserfs-tail-handling/test.sh | 2 +- tests/fsck-tests/013-extent-tree-rebuild/test.sh | 2 +- tests/fsck-tests/024-clear-space-cache/test.sh | 2 +- tests/misc-tests/005-convert-progress-thread-crash/test.sh | 2 +- tests/misc-tests/016-send-clone-src/test.sh | 2 +- tests/misc-tests/017-recv-stream-malformatted/test.sh | 2 +- tests/misc-tests/018-recv-end-of-stream/test.sh | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/cli-tests/002-balance-full-no-filters/test.sh b/tests/cli-tests/002-balance-full-no-filters/test.sh index 0501aad2..0475ea73 100755 --- a/tests/cli-tests/002-balance-full-no-filters/test.sh +++ b/tests/cli-tests/002-balance-full-no-filters/test.sh @@ -8,7 +8,7 @@ check_prereq mkfs.btrfs check_prereq btrfs setup_root_helper -prepare_test_dev 2g +prepare_test_dev run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev diff --git a/tests/cli-tests/004-send-parent-multi-subvol/test.sh b/tests/cli-tests/004-send-parent-multi-subvol/test.sh index 49226f9b..c1348b50 100755 --- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh +++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh @@ -8,7 +8,7 @@ check_prereq mkfs.btrfs check_prereq btrfs setup_root_helper -prepare_test_dev 2g +prepare_test_dev run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev diff --git a/tests/cli-tests/005-qgroup-show/test.sh b/tests/cli-tests/005-qgroup-show/test.sh index 2af13033..d9a91831 100755 --- a/tests/cli-tests/005-qgroup-show/test.sh +++ b/tests/cli-tests/005-qgroup-show/test.sh @@ -8,7 +8,7 @@ check_prereq mkfs.btrfs check_prereq btrfs setup_root_helper -prepare_test_dev 2g +prepare_test_dev run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev diff --git a/tests/convert-tests/001-ext2-basic/test.sh b/tests/convert-tests/001-ext2-basic/test.sh index d94bf0b6..af75d948 100755 --- a/tests/convert-tests/001-ext2-basic/test.sh +++ b/tests/convert-tests/001-ext2-basic/test.sh @@ -4,7 +4,7 @@ source "$TOP/tests/common" source "$TOP/tests/common.convert" setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs diff --git a/tests/convert-tests/002-ext3-basic/test.sh b/tests/convert-tests/002-ext3-basic/test.sh index f00e0e82..233e2d94 100755 --- a/tests/convert-tests/002-ext3-basic/test.sh +++ b/tests/convert-tests/002-ext3-basic/test.sh @@ -4,7 +4,7 @@ source "$TOP/tests/common" source "$TOP/tests/common.convert" setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs diff --git a/tests/convert-tests/003-ext4-basic/test.sh b/tests/convert-tests/003-ext4-basic/test.sh index d33f1d9a..baf6115c 100755 --- a/tests/convert-tests/003-ext4-basic/test.sh +++ b/tests/convert-tests/003-ext4-basic/test.sh @@ -4,7 +4,7 @@ source "$TOP/tests/common" source "$TOP/tests/common.convert" setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs diff --git a/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh b/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh index 0ce62f78..cf354d40 100755 --- a/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh +++ b/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh @@ -18,7 +18,7 @@ check_global_prereq e2fsck check_global_prereq xzcat setup_root_helper -prepare_test_dev 512M +prepare_test_dev # override common function function check_image() { diff --git a/tests/convert-tests/005-delete-all-rollback/test.sh b/tests/convert-tests/005-delete-all-rollback/test.sh index 19aa76d4..31fa2c4b 100755 --- a/tests/convert-tests/005-delete-all-rollback/test.sh +++ b/tests/convert-tests/005-delete-all-rollback/test.sh @@ -6,7 +6,7 @@ source "$TOP/tests/common" source "$TOP/tests/common.convert" setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs diff --git a/tests/convert-tests/006-large-hole-extent/test.sh b/tests/convert-tests/006-large-hole-extent/test.sh index 0edb6280..38e97055 100755 --- a/tests/convert-tests/006-large-hole-extent/test.sh +++ b/tests/convert-tests/006-large-hole-extent/test.sh @@ -9,7 +9,7 @@ source "$TOP/tests/common" source "$TOP/tests/common.convert" setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs diff --git a/tests/convert-tests/007-unsupported-block-sizes/test.sh b/tests/convert-tests/007-unsupported-block-sizes/test.sh index f1b29726..ef010202 100755 --- a/tests/convert-tests/007-unsupported-block-sizes/test.sh +++ b/tests/convert-tests/007-unsupported-block-sizes/test.sh @@ -5,7 +5,7 @@ source "$TOP/tests/common" source "$TOP/tests/common.convert" setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs diff --git a/tests/convert-tests/008-readonly-image/test.sh b/tests/convert-tests/008-readonly-image/test.sh index 8551fb9b..064bc271 100755 --- a/tests/convert-tests/008-readonly-image/test.sh +++ b/tests/convert-tests/008-readonly-image/test.sh @@ -5,7 +5,7 @@ source "$TOP/tests/common" source "$TOP/tests/common.convert" setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs diff --git a/tests/convert-tests/009-common-inode-flags/test.sh b/tests/convert-tests/009-common-inode-flags/test.sh index cd7b5111..6d159993 100755 --- a/tests/convert-tests/009-common-inode-flags/test.sh +++ b/tests/convert-tests/009-common-inode-flags/test.sh @@ -5,7 +5,7 @@ source "$TOP/tests/common" source "$TOP/tests/common.convert" setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mke2fs check_global_prereq lsattr diff --git a/tests/convert-tests/010-reiserfs-basic/test.sh b/tests/convert-tests/010-reiserfs-basic/test.sh index 261f8704..87008f15 100755 --- a/tests/convert-tests/010-reiserfs-basic/test.sh +++ b/tests/convert-tests/010-reiserfs-basic/test.sh @@ -8,7 +8,7 @@ if ! check_kernel_support_reiserfs >/dev/null; then fi setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mkreiserfs 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 c6c3119e..0b8366c8 100755 --- a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh +++ b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh @@ -9,7 +9,7 @@ if ! check_kernel_support_reiserfs >/dev/null; then fi setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mkreiserfs diff --git a/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh b/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh index 7a8d4972..dde1b3eb 100755 --- a/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh +++ b/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh @@ -13,7 +13,7 @@ if ! check_kernel_support_reiserfs >/dev/null; then fi setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mkreiserfs 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 e242a3b0..a15240ce 100755 --- a/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh +++ b/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh @@ -9,7 +9,7 @@ if ! check_kernel_support_reiserfs >/dev/null; then fi setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq mkreiserfs check_global_prereq chattr diff --git a/tests/convert-tests/014-reiserfs-tail-handling/test.sh b/tests/convert-tests/014-reiserfs-tail-handling/test.sh index f6131d96..335c0091 100755 --- a/tests/convert-tests/014-reiserfs-tail-handling/test.sh +++ b/tests/convert-tests/014-reiserfs-tail-handling/test.sh @@ -14,7 +14,7 @@ if ! check_kernel_support_reiserfs >/dev/null; then fi setup_root_helper -prepare_test_dev 512M +prepare_test_dev check_prereq btrfs-convert check_global_prereq md5sum check_global_prereq mkreiserfs diff --git a/tests/fsck-tests/013-extent-tree-rebuild/test.sh b/tests/fsck-tests/013-extent-tree-rebuild/test.sh index 90fe2e83..d71c1b2e 100755 --- a/tests/fsck-tests/013-extent-tree-rebuild/test.sh +++ b/tests/fsck-tests/013-extent-tree-rebuild/test.sh @@ -7,7 +7,7 @@ check_prereq mkfs.btrfs check_prereq btrfs setup_root_helper -prepare_test_dev 1G +prepare_test_dev # test whether fsck can rebuild a corrupted extent tree test_extent_tree_rebuild() diff --git a/tests/fsck-tests/024-clear-space-cache/test.sh b/tests/fsck-tests/024-clear-space-cache/test.sh index 6cf8440b..76ebcb6b 100755 --- a/tests/fsck-tests/024-clear-space-cache/test.sh +++ b/tests/fsck-tests/024-clear-space-cache/test.sh @@ -7,7 +7,7 @@ check_prereq btrfs check_prereq mkfs.btrfs setup_root_helper -prepare_test_dev 1G +prepare_test_dev run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev diff --git a/tests/misc-tests/005-convert-progress-thread-crash/test.sh b/tests/misc-tests/005-convert-progress-thread-crash/test.sh index 054069c2..bc71e1fd 100755 --- a/tests/misc-tests/005-convert-progress-thread-crash/test.sh +++ b/tests/misc-tests/005-convert-progress-thread-crash/test.sh @@ -6,7 +6,7 @@ source $TOP/tests/common check_prereq btrfs-convert mkfs.ext4 -V &>/dev/null || _not_run "mkfs.ext4 not found" -prepare_test_dev 1G +prepare_test_dev for ((i = 0; i < 20; i++)); do echo "loop $i" >>$RESULTS diff --git a/tests/misc-tests/016-send-clone-src/test.sh b/tests/misc-tests/016-send-clone-src/test.sh index 479da677..2780ebbd 100755 --- a/tests/misc-tests/016-send-clone-src/test.sh +++ b/tests/misc-tests/016-send-clone-src/test.sh @@ -10,7 +10,7 @@ check_prereq btrfs setup_root_helper -prepare_test_dev 1g +prepare_test_dev run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev diff --git a/tests/misc-tests/017-recv-stream-malformatted/test.sh b/tests/misc-tests/017-recv-stream-malformatted/test.sh index 3756be27..d199a72e 100755 --- a/tests/misc-tests/017-recv-stream-malformatted/test.sh +++ b/tests/misc-tests/017-recv-stream-malformatted/test.sh @@ -9,7 +9,7 @@ check_prereq btrfs setup_root_helper -prepare_test_dev 1g +prepare_test_dev run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev diff --git a/tests/misc-tests/018-recv-end-of-stream/test.sh b/tests/misc-tests/018-recv-end-of-stream/test.sh index 3b8a0319..9ca035f7 100755 --- a/tests/misc-tests/018-recv-end-of-stream/test.sh +++ b/tests/misc-tests/018-recv-end-of-stream/test.sh @@ -9,7 +9,7 @@ check_prereq mkfs.btrfs check_prereq btrfs setup_root_helper -prepare_test_dev 1g +prepare_test_dev here=`pwd`