btrfs-progs: tests: reorder prereq checks and root device setup, fuzz and mkfs tests
The prerequisites should be called before the root helper or device is setup, as preferred style. Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba
parent
257a3a3744
commit
36c136edd8
|
|
@ -4,9 +4,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
run_mayfail "$TOP/btrfs" check "$1"
|
||||
|
|
|
|||
|
|
@ -4,9 +4,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs-image
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
truncate -s0 target
|
||||
|
|
|
|||
|
|
@ -5,9 +5,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
local image
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
run_mayfail "$TOP/btrfs" inspect-internal dump-tree "$1"
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
local image
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
run_mayfail "$TOP/btrfs" inspect-internal tree-stats "$1"
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
local image
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
local image
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
# redefine the one provided by common
|
||||
check_image() {
|
||||
local image
|
||||
|
|
|
|||
|
|
@ -8,6 +8,9 @@ check_prereq mkfs.btrfs
|
|||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
setup_loopdevs 4
|
||||
prepare_loopdevs
|
||||
dev1=${loopdevs[1]}
|
||||
|
||||
test_get_info()
|
||||
{
|
||||
|
|
@ -51,10 +54,6 @@ test_mkfs_multi()
|
|||
test_get_info
|
||||
}
|
||||
|
||||
setup_loopdevs 4
|
||||
prepare_loopdevs
|
||||
dev1=${loopdevs[1]}
|
||||
|
||||
test_mkfs_single
|
||||
test_mkfs_single -d single -m single
|
||||
test_mkfs_single -d single -m single --mixed
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
source "$TEST_TOP/common"
|
||||
|
||||
check_prereq mkfs.btrfs
|
||||
|
||||
prepare_test_dev
|
||||
|
||||
tmp=$(_mktemp_dir mkfs-rootdir)
|
||||
|
|
|
|||
|
|
@ -5,16 +5,15 @@ source "$TEST_TOP/common"
|
|||
|
||||
check_prereq mkfs.btrfs
|
||||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
prepare_test_dev
|
||||
|
||||
# mknod can create FIFO/CHAR/BLOCK file but not SOCK.
|
||||
# No neat tool to create socket file, unless using python or similar.
|
||||
# So no SOCK is tested here
|
||||
check_global_prereq mknod
|
||||
check_global_prereq dd
|
||||
|
||||
setup_root_helper
|
||||
prepare_test_dev
|
||||
|
||||
tmp=$(_mktemp_dir mkfs-rootdir)
|
||||
|
||||
run_check mkdir "$tmp/dir"
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
source "$TEST_TOP/common"
|
||||
|
||||
check_prereq mkfs.btrfs
|
||||
|
||||
prepare_test_dev
|
||||
|
||||
tmp=$(_mktemp_dir mkfs-rootdir)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ check_prereq mkfs.btrfs
|
|||
check_prereq btrfs
|
||||
|
||||
setup_root_helper
|
||||
|
||||
setup_loopdevs 4
|
||||
prepare_loopdevs
|
||||
dev1=${loopdevs[1]}
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
source "$TEST_TOP/common"
|
||||
|
||||
setup_root_helper
|
||||
prepare_test_dev
|
||||
|
||||
if ! check_min_kernel_version 5.12; then
|
||||
_not_run "zoned tests need kernel 5.12 and newer"
|
||||
fi
|
||||
|
||||
setup_root_helper
|
||||
prepare_test_dev
|
||||
|
||||
nullb="$TEST_TOP/nullb"
|
||||
# Create 128M devices with 4M zones, 32 of them
|
||||
size=128
|
||||
|
|
|
|||
Loading…
Reference in a new issue