diff options
Diffstat (limited to 'tests/fsck-tests')
16 files changed, 21 insertions, 22 deletions
diff --git a/tests/fsck-tests/006-bad-root-items/test.sh b/tests/fsck-tests/006-bad-root-items/test.sh index bf3ef781..2cbf67a8 100755 --- a/tests/fsck-tests/006-bad-root-items/test.sh +++ b/tests/fsck-tests/006-bad-root-items/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh b/tests/fsck-tests/012-leaf-corruption/test.sh index fc10a4ff..68d9f695 100755 --- a/tests/fsck-tests/012-leaf-corruption/test.sh +++ b/tests/fsck-tests/012-leaf-corruption/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs-image diff --git a/tests/fsck-tests/013-extent-tree-rebuild/test.sh b/tests/fsck-tests/013-extent-tree-rebuild/test.sh index d71c1b2e..02afdda1 100755 --- a/tests/fsck-tests/013-extent-tree-rebuild/test.sh +++ b/tests/fsck-tests/013-extent-tree-rebuild/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs-corrupt-block check_prereq mkfs.btrfs @@ -31,7 +31,7 @@ test_extent_tree_rebuild() fi # corrupt extent root node block - run_check $SUDO_HELPER "$TOP/btrfs-corrupt-block" -l "$extent_root_bytenr" \ + run_check $SUDO_HELPER "$INTERNAL_BIN/btrfs-corrupt-block" -l "$extent_root_bytenr" \ -b 4096 "$TEST_DEV" $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" >& /dev/null && \ diff --git a/tests/fsck-tests/027-tree-reloc-tree/test.sh b/tests/fsck-tests/015-tree-reloc-tree/test.sh index afad1e8d..afad1e8d 100755 --- a/tests/fsck-tests/027-tree-reloc-tree/test.sh +++ b/tests/fsck-tests/015-tree-reloc-tree/test.sh diff --git a/tests/fsck-tests/027-tree-reloc-tree/tree_reloc_for_data_reloc.img.xz b/tests/fsck-tests/015-tree-reloc-tree/tree_reloc_for_data_reloc.img.xz Binary files differindex 66d8bde6..66d8bde6 100644 --- a/tests/fsck-tests/027-tree-reloc-tree/tree_reloc_for_data_reloc.img.xz +++ b/tests/fsck-tests/015-tree-reloc-tree/tree_reloc_for_data_reloc.img.xz diff --git a/tests/fsck-tests/027-tree-reloc-tree/tree_reloc_for_fs_tree.img.xz b/tests/fsck-tests/015-tree-reloc-tree/tree_reloc_for_fs_tree.img.xz Binary files differindex 22af324b..22af324b 100644 --- a/tests/fsck-tests/027-tree-reloc-tree/tree_reloc_for_fs_tree.img.xz +++ b/tests/fsck-tests/015-tree-reloc-tree/tree_reloc_for_fs_tree.img.xz diff --git a/tests/fsck-tests/018-leaf-crossing-stripes/test.sh b/tests/fsck-tests/018-leaf-crossing-stripes/test.sh index 29eb20b5..2a3f6379 100755 --- a/tests/fsck-tests/018-leaf-crossing-stripes/test.sh +++ b/tests/fsck-tests/018-leaf-crossing-stripes/test.sh @@ -1,6 +1,6 @@ #!/bin/bash -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/fsck-tests/019-non-skinny-false-alert/test.sh b/tests/fsck-tests/019-non-skinny-false-alert/test.sh index 550f2947..32f595da 100755 --- a/tests/fsck-tests/019-non-skinny-false-alert/test.sh +++ b/tests/fsck-tests/019-non-skinny-false-alert/test.sh @@ -11,7 +11,7 @@ # # a buggy check leads to the above messages -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/fsck-tests/020-extent-ref-cases/test.sh b/tests/fsck-tests/020-extent-ref-cases/test.sh index 0c4f7848..9cf99a51 100755 --- a/tests/fsck-tests/020-extent-ref-cases/test.sh +++ b/tests/fsck-tests/020-extent-ref-cases/test.sh @@ -15,7 +15,7 @@ # the beginning of leaf. # Which caused false alert for lowmem mode. -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/fsck-tests/021-partially-dropped-snapshot-case/test.sh b/tests/fsck-tests/021-partially-dropped-snapshot-case/test.sh index 5d997e24..e6379f97 100755 --- a/tests/fsck-tests/021-partially-dropped-snapshot-case/test.sh +++ b/tests/fsck-tests/021-partially-dropped-snapshot-case/test.sh @@ -2,7 +2,7 @@ # confirm whether 'btrfs check' supports check ing of a partially dropped # snapshot -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/fsck-tests/022-qgroup-rescan-halfway/test.sh b/tests/fsck-tests/022-qgroup-rescan-halfway/test.sh index dcdc1b42..615f003d 100755 --- a/tests/fsck-tests/022-qgroup-rescan-halfway/test.sh +++ b/tests/fsck-tests/022-qgroup-rescan-halfway/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # check whether btrfsck can detect running qgroup rescan -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/fsck-tests/023-qgroup-stack-overflow/test.sh b/tests/fsck-tests/023-qgroup-stack-overflow/test.sh index ebb07f36..d7b85f07 100755 --- a/tests/fsck-tests/023-qgroup-stack-overflow/test.sh +++ b/tests/fsck-tests/023-qgroup-stack-overflow/test.sh @@ -5,7 +5,7 @@ # Fixed by patch: # btrfs-progs: Fix stack overflow for checking qgroup on tree reloc tree -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/fsck-tests/024-clear-space-cache/test.sh b/tests/fsck-tests/024-clear-space-cache/test.sh index 76ebcb6b..6a3a31ec 100755 --- a/tests/fsck-tests/024-clear-space-cache/test.sh +++ b/tests/fsck-tests/024-clear-space-cache/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # confirm that clearing space cache works -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs check_prereq mkfs.btrfs diff --git a/tests/fsck-tests/025-file-extents/test.sh b/tests/fsck-tests/025-file-extents/test.sh index ebe8a305..95707596 100755 --- a/tests/fsck-tests/025-file-extents/test.sh +++ b/tests/fsck-tests/025-file-extents/test.sh @@ -1,7 +1,7 @@ #!/bin/bash # Confirm btrfs check can check file extents without causing false alert -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs check_prereq mkfs.btrfs diff --git a/tests/fsck-tests/026-bad-dir-item-name/test.sh b/tests/fsck-tests/026-bad-dir-item-name/test.sh index a1077a8d..a38bf045 100755 --- a/tests/fsck-tests/026-bad-dir-item-name/test.sh +++ b/tests/fsck-tests/026-bad-dir-item-name/test.sh @@ -2,7 +2,7 @@ # # confirm whether check detects name and hash mismatch in dir_item -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs diff --git a/tests/fsck-tests/028-unaligned-super-dev-sizes/test.sh b/tests/fsck-tests/028-unaligned-super-dev-sizes/test.sh index 6f315fae..4015df2d 100755 --- a/tests/fsck-tests/028-unaligned-super-dev-sizes/test.sh +++ b/tests/fsck-tests/028-unaligned-super-dev-sizes/test.sh @@ -3,24 +3,23 @@ # An image with mis-aligned superblock total_bytes, that will be found and # fixed by 'check' or fixed by 'rescue fix-device-size' -source "$TOP/tests/common" +source "$TEST_TOP/common" check_prereq btrfs -prepare_test_dev setup_root_helper check_all_images -image=$(extract_image "./dev_and_super_mismatch_unaligned.raw.xz") +TEST_DEV=$(extract_image "./dev_and_super_mismatch_unaligned.raw.xz") # detect and fix -run_check "$TOP/btrfs" rescue fix-device-size "$image" +run_check "$TOP/btrfs" rescue fix-device-size "$TEST_DEV" # no problem found -run_check "$TOP/btrfs" rescue fix-device-size "$image" +run_check "$TOP/btrfs" rescue fix-device-size "$TEST_DEV" # check if fix-device-size worked -run_check "$TOP/btrfs" check "$image" +run_check "$TOP/btrfs" check "$TEST_DEV" # mount test run_check_mount_test_dev -run_check_umount_test_dev - -rm -f "$image" +run_check_umount_test_dev "$TEST_MNT" +# remove restored image +rm -- "$TEST_DEV" |