Use TEST_TOP for tests directory.
And INTERNAL_BIN for internal binaries.
Signed-off-by: Gu Jinxiang <g...@cn.fujitsu.com>
---
tests/cli-tests.sh | 15 ++++++++++-----
tests/cli-tests/001-btrfs/test.sh | 2 +-
tests/cli-tests/002-balance-full-no-filters/test.sh | 2 +-
tests/cli-tests/003-fi-resize-args/test.sh | 2 +-
tests/cli-tests/004-send-parent-multi-subvol/test.sh | 2 +-
tests/cli-tests/005-qgroup-show/test.sh | 2 +-
tests/cli-tests/006-qgroup-show-sync/test.sh | 2 +-
tests/cli-tests/007-check-force/test.sh | 2 +-
tests/cli-tests/008-subvolume-get-set-default/test.sh | 2 +-
tests/common | 16 ++++++++++------
tests/convert-tests.sh | 15 ++++++++++-----
tests/convert-tests/001-ext2-basic/test.sh | 4 ++--
tests/convert-tests/002-ext3-basic/test.sh | 4 ++--
tests/convert-tests/003-ext4-basic/test.sh | 4 ++--
.../004-ext2-backup-superblock-ranges/test.sh | 2 +-
tests/convert-tests/005-delete-all-rollback/test.sh | 4 ++--
tests/convert-tests/006-large-hole-extent/test.sh | 4 ++--
tests/convert-tests/007-unsupported-block-sizes/test.sh | 4 ++--
tests/convert-tests/008-readonly-image/test.sh | 4 ++--
tests/convert-tests/009-common-inode-flags/test.sh | 4 ++--
tests/convert-tests/010-reiserfs-basic/test.sh | 4 ++--
.../011-reiserfs-delete-all-rollback/test.sh | 4 ++--
.../012-reiserfs-large-hole-extent/test.sh | 4 ++--
.../013-reiserfs-common-inode-flags/test.sh | 4 ++--
tests/convert-tests/014-reiserfs-tail-handling/test.sh | 4 ++--
.../convert-tests/015-no-rollback-after-balance/test.sh | 4 ++--
tests/fsck-tests.sh | 17 ++++++++++++-----
tests/fsck-tests/006-bad-root-items/test.sh | 2 +-
tests/fsck-tests/012-leaf-corruption/test.sh | 2 +-
tests/fsck-tests/013-extent-tree-rebuild/test.sh | 4 ++--
tests/fsck-tests/018-leaf-crossing-stripes/test.sh | 2 +-
tests/fsck-tests/019-non-skinny-false-alert/test.sh | 2 +-
tests/fsck-tests/020-extent-ref-cases/test.sh | 2 +-
.../021-partially-dropped-snapshot-case/test.sh | 2 +-
tests/fsck-tests/022-qgroup-rescan-halfway/test.sh | 2 +-
tests/fsck-tests/023-qgroup-stack-overflow/test.sh | 2 +-
tests/fsck-tests/024-clear-space-cache/test.sh | 2 +-
tests/fsck-tests/025-file-extents/test.sh | 2 +-
tests/fsck-tests/026-bad-dir-item-name/test.sh | 2 +-
tests/fsck-tests/027-tree-reloc-tree/test.sh | 2 +-
tests/fsck-tests/028-unaligned-super-dev-sizes/test.sh | 2 +-
tests/fuzz-tests.sh | 15 ++++++++++-----
tests/fuzz-tests/001-simple-check-unmounted/test.sh | 4 ++--
tests/fuzz-tests/002-simple-image/test.sh | 4 ++--
tests/fuzz-tests/003-multi-check-unmounted/test.sh | 4 ++--
tests/fuzz-tests/004-simple-dump-tree/test.sh | 4 ++--
tests/fuzz-tests/005-simple-dump-super/test.sh | 4 ++--
tests/fuzz-tests/006-simple-tree-stats/test.sh | 4 ++--
tests/fuzz-tests/007-simple-super-recover/test.sh | 4 ++--
tests/fuzz-tests/008-simple-chunk-recover/test.sh | 4 ++--
tests/fuzz-tests/009-simple-zero-log/test.sh | 4 ++--
tests/misc-tests.sh | 17 ++++++++++++-----
tests/misc-tests/001-btrfstune-features/test.sh | 2 +-
tests/misc-tests/002-uuid-rewrite/test.sh | 6 +++---
tests/misc-tests/003-zero-log/test.sh | 4 ++--
tests/misc-tests/004-shrink-fs/test.sh | 2 +-
.../005-convert-progress-thread-crash/test.sh | 2 +-
tests/misc-tests/006-image-on-missing-device/test.sh | 2 +-
tests/misc-tests/007-subvolume-sync/test.sh | 2 +-
tests/misc-tests/008-leaf-crossing-stripes/test.sh | 2 +-
tests/misc-tests/009-subvolume-sync-must-wait/test.sh | 2 +-
tests/misc-tests/010-convert-delete-ext2-subvol/test.sh | 2 +-
tests/misc-tests/011-delete-missing-device/test.sh | 2 +-
tests/misc-tests/012-find-root-no-result/test.sh | 2 +-
tests/misc-tests/013-subvolume-sync-crash/test.sh | 2 +-
tests/misc-tests/014-filesystem-label/test.sh | 2 +-
tests/misc-tests/015-dump-super-garbage/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 +-
.../019-receive-clones-on-mounted-subvol/test.sh | 4 ++--
tests/misc-tests/020-fix-superblock-corruption/test.sh | 2 +-
tests/misc-tests/021-image-multi-devices/test.sh | 2 +-
.../022-filesystem-du-on-empty-subvol/test.sh | 2 +-
.../023-device-usage-with-missing-device/test.sh | 2 +-
tests/misc-tests/024-inspect-internal-rootid/test.sh | 2 +-
tests/misc-tests/025-zstd-compression/test.sh | 2 +-
tests/misc-tests/026-image-non-printable-chars/test.sh | 2 +-
.../misc-tests/027-subvol-list-deleted-toplevel/test.sh | 2 +-
tests/mkfs-tests.sh | 17 ++++++++++++-----
tests/mkfs-tests/001-basic-profiles/test.sh | 2 +-
.../002-no-force-mixed-on-small-volume/test.sh | 2 +-
tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh | 2 +-
tests/mkfs-tests/004-rootdir-keeps-size/test.sh | 4 ++--
tests/mkfs-tests/005-long-device-name-for-ssd/test.sh | 2 +-
tests/mkfs-tests/006-partitioned-loopdev/test.sh | 2 +-
tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh | 2 +-
.../008-sectorsize-nodesize-combination/test.sh | 2 +-
tests/mkfs-tests/009-special-files-for-rootdir/test.sh | 2 +-
89 files changed, 187 insertions(+), 147 deletions(-)
diff --git a/tests/cli-tests.sh b/tests/cli-tests.sh
index 16d6afcf..b981f833 100755
--- a/tests/cli-tests.sh
+++ b/tests/cli-tests.sh
@@ -4,13 +4,18 @@
LANG=C
SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+TEST_TOP=$(readlink -f "$SCRIPT_DIR/../tests/")
TOP=$(readlink -f "$SCRIPT_DIR/../")
+if ! [ -f "$TOP/btrfs" ];then
+ TOP=$(dirname `which btrfs`)
+fi
TEST_DEV=${TEST_DEV:-}
-RESULTS="$TOP/tests/cli-tests-results.txt"
-IMAGE="$TOP/tests/test.img"
+RESULTS="$TEST_TOP/cli-tests-results.txt"
+IMAGE="$TEST_TOP/test.img"
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
+export TEST_TOP
export TOP
export RESULTS
export LANG
@@ -24,7 +29,7 @@ check_kernel_support
# The tests are driven by their custom script called 'test.sh'
-for i in $(find "$TOP/tests/cli-tests" -maxdepth 1 -mindepth 1 -type d \
+for i in $(find "$TEST_TOP/cli-tests" -maxdepth 1 -mindepth 1 -type d \
${TEST:+-name "$TEST"} | sort)
do
name=$(basename "$i")
@@ -40,5 +45,5 @@ do
_fail "test failed for case $(basename $i)"
fi
fi
- cd "$TOP"
+ cd "$TEST_TOP"
done
diff --git a/tests/cli-tests/001-btrfs/test.sh
b/tests/cli-tests/001-btrfs/test.sh
index c680604b..55ab0ad5 100755
--- a/tests/cli-tests/001-btrfs/test.sh
+++ b/tests/cli-tests/001-btrfs/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# test commands of btrfs
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq btrfs
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 0475ea73..3403b700 100755
--- a/tests/cli-tests/002-balance-full-no-filters/test.sh
+++ b/tests/cli-tests/002-balance-full-no-filters/test.sh
@@ -2,7 +2,7 @@
#
# coverage of balance --full-balance
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/cli-tests/003-fi-resize-args/test.sh
b/tests/cli-tests/003-fi-resize-args/test.sh
index e4f262b6..f6f598f2 100755
--- a/tests/cli-tests/003-fi-resize-args/test.sh
+++ b/tests/cli-tests/003-fi-resize-args/test.sh
@@ -2,7 +2,7 @@
#
# test parsing of various resize arguments
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
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 c1348b50..165ef4a6 100755
--- a/tests/cli-tests/004-send-parent-multi-subvol/test.sh
+++ b/tests/cli-tests/004-send-parent-multi-subvol/test.sh
@@ -2,7 +2,7 @@
#
# minimal test for the following syntax: btrfs send -p parent subvol1 subvol2
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/cli-tests/005-qgroup-show/test.sh
b/tests/cli-tests/005-qgroup-show/test.sh
index d9a91831..10521039 100755
--- a/tests/cli-tests/005-qgroup-show/test.sh
+++ b/tests/cli-tests/005-qgroup-show/test.sh
@@ -2,7 +2,7 @@
#
# qgroup show behaviour when quotas are not enabled
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/cli-tests/006-qgroup-show-sync/test.sh
b/tests/cli-tests/006-qgroup-show-sync/test.sh
index d552b8b9..aec7a4ba 100755
--- a/tests/cli-tests/006-qgroup-show-sync/test.sh
+++ b/tests/cli-tests/006-qgroup-show-sync/test.sh
@@ -2,7 +2,7 @@
#
# simple test of qgroup show --sync option
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/cli-tests/007-check-force/test.sh
b/tests/cli-tests/007-check-force/test.sh
index 12b30205..597f2d60 100755
--- a/tests/cli-tests/007-check-force/test.sh
+++ b/tests/cli-tests/007-check-force/test.sh
@@ -2,7 +2,7 @@
#
# test 'btrfs check --force' on a mounted filesystem
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/cli-tests/008-subvolume-get-set-default/test.sh
b/tests/cli-tests/008-subvolume-get-set-default/test.sh
index 9318002e..706ee8c5 100755
--- a/tests/cli-tests/008-subvolume-get-set-default/test.sh
+++ b/tests/cli-tests/008-subvolume-get-set-default/test.sh
@@ -10,7 +10,7 @@ check_default_id()
fi
}
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/common b/tests/common
index 734cd171..2ca23561 100644
--- a/tests/common
+++ b/tests/common
@@ -290,8 +290,12 @@ run_mustfail_stdout()
check_prereq()
{
- if ! [ -f "$TOP/$1" ]; then
- _fail "Failed prerequisites: $1";
+ if [ "$1" = "btrfs-corrupt-block" -o "$1" = "fssum" ]; then
+ if ! [ -f "$INTERNAL_BIN/$1" ]; then
+ _fail "Failed prerequisites: $INTERNAL_BIN/$1";
+ fi
+ elif ! [ -f "$TOP/$1" ]; then
+ _fail "Failed prerequisites: $TOP/$1";
fi
}
@@ -448,9 +452,9 @@ prepare_test_dev()
return;
fi
- echo "\$TEST_DEV not given, use $TOP/test/test.img as fallback" >> \
+ echo "\$TEST_DEV not given, use $TEST_TOP/test.img as fallback" >> \
"$RESULTS"
- TEST_DEV="$TOP/tests/test.img"
+ TEST_DEV="$TEST_TOP/test.img"
truncate -s "$size" "$TEST_DEV" || _not_run "create file for loop
device failed"
}
@@ -626,11 +630,11 @@ cleanup_loopdevs()
init_env()
{
- TEST_MNT="${TEST_MNT:-$TOP/tests/mnt}"
+ TEST_MNT="${TEST_MNT:-$TEST_TOP/mnt}"
export TEST_MNT
mkdir -p "$TEST_MNT" || { echo "Failed mkdir -p $TEST_MNT"; exit 1; }
- source $TOP/tests/common.local
+ source $TEST_TOP/common.local
if [ "$TEST_ENABLE_OVERRIDE" = 'true' -a -n "$RESULTS" ]; then
echo "INCLUDE common.local" >> "$RESULTS"
diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh
index 2a92a58b..52c59d4d 100755
--- a/tests/convert-tests.sh
+++ b/tests/convert-tests.sh
@@ -5,14 +5,19 @@
LANG=C
SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+TEST_TOP=$(readlink -f "$SCRIPT_DIR/../tests/")
TOP=$(readlink -f "$SCRIPT_DIR/../")
+if ! [ -f "$TOP/btrfs" ];then
+ TOP=$(dirname `which btrfs`)
+fi
TEST_DEV=${TEST_DEV:-}
-RESULTS="$TOP/tests/convert-tests-results.txt"
-IMAGE="$TOP/tests/test.img"
+RESULTS="$TEST_TOP/convert-tests-results.txt"
+IMAGE="$TEST_TOP/test.img"
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
+export TEST_TOP
export TOP
export RESULTS
export LANG
@@ -54,7 +59,7 @@ run_one_test() {
}
# Test special images
-for i in $(find "$TOP/tests/convert-tests" -maxdepth 1 -mindepth 1 -type d \
+for i in $(find "$TEST_TOP/convert-tests" -maxdepth 1 -mindepth 1 -type d \
${TEST:+-name "$TEST"} | sort)
do
run_one_test "$i"
diff --git a/tests/convert-tests/001-ext2-basic/test.sh
b/tests/convert-tests/001-ext2-basic/test.sh
index af75d948..74cc74e8 100755
--- a/tests/convert-tests/001-ext2-basic/test.sh
+++ b/tests/convert-tests/001-ext2-basic/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
diff --git a/tests/convert-tests/002-ext3-basic/test.sh
b/tests/convert-tests/002-ext3-basic/test.sh
index 233e2d94..f0869897 100755
--- a/tests/convert-tests/002-ext3-basic/test.sh
+++ b/tests/convert-tests/002-ext3-basic/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
diff --git a/tests/convert-tests/003-ext4-basic/test.sh
b/tests/convert-tests/003-ext4-basic/test.sh
index baf6115c..c5caf67c 100755
--- a/tests/convert-tests/003-ext4-basic/test.sh
+++ b/tests/convert-tests/003-ext4-basic/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
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 cf354d40..dcb9772b 100755
--- a/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh
+++ b/tests/convert-tests/004-ext2-backup-superblock-ranges/test.sh
@@ -10,7 +10,7 @@
# 4) Overlap file extents
# 5) Unable to rollback
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq btrfs-convert
check_prereq btrfs
diff --git a/tests/convert-tests/005-delete-all-rollback/test.sh
b/tests/convert-tests/005-delete-all-rollback/test.sh
index 31fa2c4b..a5f9d594 100755
--- a/tests/convert-tests/005-delete-all-rollback/test.sh
+++ b/tests/convert-tests/005-delete-all-rollback/test.sh
@@ -2,8 +2,8 @@
# create a base image, convert to btrfs, remove all files, rollback the ext4
image
# note: ext4 only
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
diff --git a/tests/convert-tests/006-large-hole-extent/test.sh
b/tests/convert-tests/006-large-hole-extent/test.sh
index 38e97055..a37fcbdc 100755
--- a/tests/convert-tests/006-large-hole-extent/test.sh
+++ b/tests/convert-tests/006-large-hole-extent/test.sh
@@ -5,8 +5,8 @@
# Fast pinpoint regression test. No options combination nor checksum
# verification
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
diff --git a/tests/convert-tests/007-unsupported-block-sizes/test.sh
b/tests/convert-tests/007-unsupported-block-sizes/test.sh
index ef010202..9fda5add 100755
--- a/tests/convert-tests/007-unsupported-block-sizes/test.sh
+++ b/tests/convert-tests/007-unsupported-block-sizes/test.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# Check if block sizes smaller than 4k expectedly fail to convert
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
diff --git a/tests/convert-tests/008-readonly-image/test.sh
b/tests/convert-tests/008-readonly-image/test.sh
index 064bc271..1a65ea6b 100755
--- a/tests/convert-tests/008-readonly-image/test.sh
+++ b/tests/convert-tests/008-readonly-image/test.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# Check if the converted ext2 image is readonly
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
diff --git a/tests/convert-tests/009-common-inode-flags/test.sh
b/tests/convert-tests/009-common-inode-flags/test.sh
index 6d159993..428213bf 100755
--- a/tests/convert-tests/009-common-inode-flags/test.sh
+++ b/tests/convert-tests/009-common-inode-flags/test.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# Check if btrfs-convert can copy common inode flags like SYNC/IMMUTABLE
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
diff --git a/tests/convert-tests/010-reiserfs-basic/test.sh
b/tests/convert-tests/010-reiserfs-basic/test.sh
index 87008f15..73652991 100755
--- a/tests/convert-tests/010-reiserfs-basic/test.sh
+++ b/tests/convert-tests/010-reiserfs-basic/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
if ! check_kernel_support_reiserfs >/dev/null; then
_not_run "no reiserfs support"
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 0b8366c8..28877e14 100755
--- a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
+++ b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# create a base image, convert to btrfs, remove all files, rollback the
reiserfs image
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
if ! check_kernel_support_reiserfs >/dev/null; then
_not_run "no reiserfs support"
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 dde1b3eb..d492779a 100755
--- a/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh
+++ b/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh
@@ -5,8 +5,8 @@
# Fast pinpoint regression test. No options combination nor checksum
# verification
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
if ! check_kernel_support_reiserfs >/dev/null; then
_not_run "no reiserfs support"
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 a15240ce..521e8bd4 100755
--- a/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh
+++ b/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh
@@ -1,8 +1,8 @@
#!/bin/bash
# Check if btrfs-convert can copy common inode flags like SYNC/IMMUTABLE
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
if ! check_kernel_support_reiserfs >/dev/null; then
_not_run "no reiserfs support"
diff --git a/tests/convert-tests/014-reiserfs-tail-handling/test.sh
b/tests/convert-tests/014-reiserfs-tail-handling/test.sh
index 335c0091..5714dc6c 100755
--- a/tests/convert-tests/014-reiserfs-tail-handling/test.sh
+++ b/tests/convert-tests/014-reiserfs-tail-handling/test.sh
@@ -6,8 +6,8 @@
# We use separate inputs for tails and real blocks so we can determine
# if there was a failure in copying either.
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
if ! check_kernel_support_reiserfs >/dev/null; then
_not_run "no reiserfs support"
diff --git a/tests/convert-tests/015-no-rollback-after-balance/test.sh
b/tests/convert-tests/015-no-rollback-after-balance/test.sh
index 47c9c6fa..2f6407f3 100755
--- a/tests/convert-tests/015-no-rollback-after-balance/test.sh
+++ b/tests/convert-tests/015-no-rollback-after-balance/test.sh
@@ -2,8 +2,8 @@
# Check if btrfs-convert refuses to rollback the filesystem, and leave the fs
# and the convert image untouched
-source "$TOP/tests/common"
-source "$TOP/tests/common.convert"
+source "$TEST_TOP/common"
+source "$TEST_TOP/common.convert"
setup_root_helper
prepare_test_dev
diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh
index 15d26c70..f97ae986 100755
--- a/tests/fsck-tests.sh
+++ b/tests/fsck-tests.sh
@@ -4,13 +4,20 @@
LANG=C
SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+INTERNAL_BIN=$(readlink -f "$SCRIPT_DIR/../")
+TEST_TOP=$(readlink -f "$SCRIPT_DIR/../tests/")
TOP=$(readlink -f "$SCRIPT_DIR/../")
+if ! [ -f "$TOP/btrfs" ];then
+ TOP=$(dirname `which btrfs`)
+fi
TEST_DEV=${TEST_DEV:-}
-RESULTS="$TOP/tests/fsck-tests-results.txt"
-IMAGE="$TOP/tests/test.img"
+RESULTS="$TEST_TOP/fsck-tests-results.txt"
+IMAGE="$TEST_TOP/test.img"
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
+export INTERNAL_BIN
+export TEST_TOP
export TOP
export RESULTS
export LANG
@@ -46,7 +53,7 @@ run_one_test() {
# Type 1
check_all_images
fi
- cd "$TOP"
+ cd "$TEST_TOP"
}
# Each dir contains one type of error for btrfsck test.
@@ -62,7 +69,7 @@ run_one_test() {
# This is for case btrfs-image can't dump or case needs extra
# check/verify
-for i in $(find "$TOP/tests/fsck-tests" -maxdepth 1 -mindepth 1 -type d
\
+for i in $(find "$TEST_TOP/fsck-tests" -maxdepth 1 -mindepth 1 -type d \
${TEST:+-name "$TEST"} | sort)
do
run_one_test "$i"
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/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/027-tree-reloc-tree/test.sh
b/tests/fsck-tests/027-tree-reloc-tree/test.sh
index afad1e8d..21987b0c 100755
--- a/tests/fsck-tests/027-tree-reloc-tree/test.sh
+++ b/tests/fsck-tests/027-tree-reloc-tree/test.sh
@@ -5,7 +5,7 @@
# Also due to the short life span of reloc tree, save the as dump example for
# later usage.
-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..ee23a059 100755
--- a/tests/fsck-tests/028-unaligned-super-dev-sizes/test.sh
+++ b/tests/fsck-tests/028-unaligned-super-dev-sizes/test.sh
@@ -3,7 +3,7 @@
# 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
diff --git a/tests/fuzz-tests.sh b/tests/fuzz-tests.sh
index f72385e5..dca84f10 100755
--- a/tests/fuzz-tests.sh
+++ b/tests/fuzz-tests.sh
@@ -4,13 +4,18 @@
LANG=C
SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+TEST_TOP=$(readlink -f "$SCRIPT_DIR/../tests/")
TOP=$(readlink -f "$SCRIPT_DIR/../")
+if ! [ -f "$TOP/btrfs" ];then
+ TOP=$(dirname `which btrfs`)
+fi
TEST_DEV=${TEST_DEV:-}
-RESULTS="$TOP/tests/fuzz-tests-results.txt"
-IMAGE="$TOP/tests/test.img"
+RESULTS="$TEST_TOP/fuzz-tests-results.txt"
+IMAGE="$TEST_TOP/test.img"
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
+export TEST_TOP
export TOP
export RESULTS
export LANG
@@ -23,7 +28,7 @@ check_prereq btrfs
# The tests are driven by their custom script called 'test.sh'
-for i in $(find "$TOP/tests/fuzz-tests" -maxdepth 1 -mindepth 1 -type d
\
+for i in $(find "$TEST_TOP/fuzz-tests" -maxdepth 1 -mindepth 1 -type d \
${TEST:+-name "$TEST"} | sort)
do
name=$(basename "$i")
@@ -39,5 +44,5 @@ do
_fail "test failed for case $(basename $i)"
fi
fi
- cd "$TOP"
+ cd "$TEST_TOP"
done
diff --git a/tests/fuzz-tests/001-simple-check-unmounted/test.sh
b/tests/fuzz-tests/001-simple-check-unmounted/test.sh
index 98fe7b0c..288e9cee 100755
--- a/tests/fuzz-tests/001-simple-check-unmounted/test.sh
+++ b/tests/fuzz-tests/001-simple-check-unmounted/test.sh
@@ -2,7 +2,7 @@
# iterate over all fuzzed images and run 'btrfs check'
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs
@@ -15,6 +15,6 @@ check_image() {
run_mayfail $TOP/btrfs check "$image"
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
exit 0
diff --git a/tests/fuzz-tests/002-simple-image/test.sh
b/tests/fuzz-tests/002-simple-image/test.sh
index 42470ecc..dd9db548 100755
--- a/tests/fuzz-tests/002-simple-image/test.sh
+++ b/tests/fuzz-tests/002-simple-image/test.sh
@@ -2,7 +2,7 @@
# iterate over all fuzzed images and run 'btrfs-image'
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs-image
@@ -17,7 +17,7 @@ check_image() {
truncate -s0 target
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
rm -- target
diff --git a/tests/fuzz-tests/003-multi-check-unmounted/test.sh
b/tests/fuzz-tests/003-multi-check-unmounted/test.sh
index 9fd7b8aa..7439e949 100755
--- a/tests/fuzz-tests/003-multi-check-unmounted/test.sh
+++ b/tests/fuzz-tests/003-multi-check-unmounted/test.sh
@@ -3,7 +3,7 @@
# iterate over all fuzzed images and run 'btrfs check', try various options to
# get more code coverage
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs
@@ -21,6 +21,6 @@ check_image() {
run_mayfail $TOP/btrfs check --repair "$image"
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
exit 0
diff --git a/tests/fuzz-tests/004-simple-dump-tree/test.sh
b/tests/fuzz-tests/004-simple-dump-tree/test.sh
index 89ff214c..168ae582 100755
--- a/tests/fuzz-tests/004-simple-dump-tree/test.sh
+++ b/tests/fuzz-tests/004-simple-dump-tree/test.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs
@@ -13,6 +13,6 @@ check_image() {
run_mayfail $TOP/btrfs inspect-internal dump-tree "$image"
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
exit 0
diff --git a/tests/fuzz-tests/005-simple-dump-super/test.sh
b/tests/fuzz-tests/005-simple-dump-super/test.sh
index fbce3d9f..f5c029ff 100755
--- a/tests/fuzz-tests/005-simple-dump-super/test.sh
+++ b/tests/fuzz-tests/005-simple-dump-super/test.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs
@@ -14,6 +14,6 @@ check_image() {
run_mayfail $TOP/btrfs inspect-internal dump-super -Ffa "$image"
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
exit 0
diff --git a/tests/fuzz-tests/006-simple-tree-stats/test.sh
b/tests/fuzz-tests/006-simple-tree-stats/test.sh
index c3410b06..73dc4bde 100755
--- a/tests/fuzz-tests/006-simple-tree-stats/test.sh
+++ b/tests/fuzz-tests/006-simple-tree-stats/test.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs
@@ -13,6 +13,6 @@ check_image() {
run_mayfail $TOP/btrfs inspect-internal tree-stats "$image"
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
exit 0
diff --git a/tests/fuzz-tests/007-simple-super-recover/test.sh
b/tests/fuzz-tests/007-simple-super-recover/test.sh
index 885cb352..5bf43a85 100755
--- a/tests/fuzz-tests/007-simple-super-recover/test.sh
+++ b/tests/fuzz-tests/007-simple-super-recover/test.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs
@@ -15,6 +15,6 @@ check_image() {
rm -- "$image".scratch
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
exit 0
diff --git a/tests/fuzz-tests/008-simple-chunk-recover/test.sh
b/tests/fuzz-tests/008-simple-chunk-recover/test.sh
index d53453f6..321c4be9 100755
--- a/tests/fuzz-tests/008-simple-chunk-recover/test.sh
+++ b/tests/fuzz-tests/008-simple-chunk-recover/test.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs
@@ -15,6 +15,6 @@ check_image() {
rm -- "$image".scratch
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
exit 0
diff --git a/tests/fuzz-tests/009-simple-zero-log/test.sh
b/tests/fuzz-tests/009-simple-zero-log/test.sh
index 393db3f6..1fd61d77 100755
--- a/tests/fuzz-tests/009-simple-zero-log/test.sh
+++ b/tests/fuzz-tests/009-simple-zero-log/test.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source $TOP/tests/common
+source $TEST_TOP/common
setup_root_helper
check_prereq btrfs
@@ -15,6 +15,6 @@ check_image() {
rm -- "$image".scratch
}
-check_all_images $TOP/tests/fuzz-tests/images
+check_all_images $TEST_TOP/fuzz-tests/images
exit 0
diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh
index 08988016..fed1b36c 100755
--- a/tests/misc-tests.sh
+++ b/tests/misc-tests.sh
@@ -4,13 +4,20 @@
LANG=C
SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+TEST_TOP=$(readlink -f "$SCRIPT_DIR/../tests/")
+INTERNAL_BIN=$(readlink -f "$SCRIPT_DIR/../")
TOP=$(readlink -f "$SCRIPT_DIR/../")
+if ! [ -f "$TOP/btrfs" ];then
+ TOP=$(dirname `which btrfs`)
+fi
TEST_DEV=${TEST_DEV:-}
-RESULTS="$TOP/tests/misc-tests-results.txt"
-IMAGE="$TOP/tests/test.img"
+RESULTS="$TEST_TOP/misc-tests-results.txt"
+IMAGE="$TEST_TOP/test.img"
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
+export INTERNAL_BIN
+export TEST_TOP
export TOP
export RESULTS
export LANG
@@ -31,7 +38,7 @@ check_kernel_support
# The tests are driven by their custom script called 'test.sh'
-for i in $(find "$TOP/tests/misc-tests" -maxdepth 1 -mindepth 1 -type d
\
+for i in $(find "$TEST_TOP/misc-tests" -maxdepth 1 -mindepth 1 -type d \
${TEST:+-name "$TEST"} | sort)
do
echo " [TEST/misc] $(basename $i)"
@@ -46,5 +53,5 @@ do
_fail "test failed for case $(basename $i)"
fi
fi
- cd "$TOP"
+ cd "$TEST_TOP"
done
diff --git a/tests/misc-tests/001-btrfstune-features/test.sh
b/tests/misc-tests/001-btrfstune-features/test.sh
index bfa7f43e..b8d7a77c 100755
--- a/tests/misc-tests/001-btrfstune-features/test.sh
+++ b/tests/misc-tests/001-btrfstune-features/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# test btrfstune options that enable filesystem features
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfstune
diff --git a/tests/misc-tests/002-uuid-rewrite/test.sh
b/tests/misc-tests/002-uuid-rewrite/test.sh
index fd100fb3..acaebd58 100755
--- a/tests/misc-tests/002-uuid-rewrite/test.sh
+++ b/tests/misc-tests/002-uuid-rewrite/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# test btrfstune uuid rewriting options
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfstune
@@ -25,7 +25,7 @@ test_uuid_random()
run_check $SUDO_HELPER $TOP/mkfs.btrfs -f \
--uuid $origuuid \
- --rootdir $TOP/Documentation \
+ --rootdir $INTERNAL_BIN/Documentation \
$TEST_DEV
run_check $TOP/btrfs inspect-internal dump-super "$TEST_DEV"
currentfsid=$(run_check_stdout $TOP/btrfstune -f -u $TEST_DEV | \
@@ -47,7 +47,7 @@ test_uuid_user()
run_check $SUDO_HELPER $TOP/mkfs.btrfs -f \
--uuid $origuuid \
- --rootdir $TOP/Documentation \
+ --rootdir $INTERNAL_BIN/Documentation \
$TEST_DEV
run_check $TOP/btrfs inspect-internal dump-super "$TEST_DEV"
run_check $TOP/btrfstune -f -U $newuuid \
diff --git a/tests/misc-tests/003-zero-log/test.sh
b/tests/misc-tests/003-zero-log/test.sh
index e7c5c806..5d6114bd 100755
--- a/tests/misc-tests/003-zero-log/test.sh
+++ b/tests/misc-tests/003-zero-log/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# test zero-log
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
@@ -27,7 +27,7 @@ test_zero_log()
{
# FIXME: we need an image with existing log_root
run_check $SUDO_HELPER $TOP/mkfs.btrfs -f \
- --rootdir $TOP/Documentation \
+ --rootdir $INTERNAL_BIN/Documentation \
$TEST_DEV
run_check $TOP/btrfs inspect-internal dump-super $TEST_DEV
if [ "$1" = 'standalone' ]; then
diff --git a/tests/misc-tests/004-shrink-fs/test.sh
b/tests/misc-tests/004-shrink-fs/test.sh
index 88740358..d53d1781 100755
--- a/tests/misc-tests/004-shrink-fs/test.sh
+++ b/tests/misc-tests/004-shrink-fs/test.sh
@@ -4,7 +4,7 @@
# are able to resize (shrink) it to that size.
#
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
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 bc71e1fd..22f2400c 100755
--- a/tests/misc-tests/005-convert-progress-thread-crash/test.sh
+++ b/tests/misc-tests/005-convert-progress-thread-crash/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# test convert-thread-conflict
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq btrfs-convert
diff --git a/tests/misc-tests/006-image-on-missing-device/test.sh
b/tests/misc-tests/006-image-on-missing-device/test.sh
index 2766fb17..0e1e40ad 100755
--- a/tests/misc-tests/006-image-on-missing-device/test.sh
+++ b/tests/misc-tests/006-image-on-missing-device/test.sh
@@ -4,7 +4,7 @@
# - btrfs-image must not loop indefinetelly
# - btrfs-image will expectedly fail to produce the dump
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq btrfs-image
check_prereq mkfs.btrfs
diff --git a/tests/misc-tests/007-subvolume-sync/test.sh
b/tests/misc-tests/007-subvolume-sync/test.sh
index 243bb8cc..ad7998b6 100755
--- a/tests/misc-tests/007-subvolume-sync/test.sh
+++ b/tests/misc-tests/007-subvolume-sync/test.sh
@@ -4,7 +4,7 @@
# - btrfs subvolume must not loop indefinitely
# - btrfs subvolume return 0 in normal case
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/008-leaf-crossing-stripes/test.sh
b/tests/misc-tests/008-leaf-crossing-stripes/test.sh
index 03818062..065b89c2 100755
--- a/tests/misc-tests/008-leaf-crossing-stripes/test.sh
+++ b/tests/misc-tests/008-leaf-crossing-stripes/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# test if btrfs-convert creates a filesystem without leaf crossing stripes
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq btrfs-convert
check_prereq btrfs
diff --git a/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
b/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
index fa3f09ab..8a39ab7f 100755
--- a/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
+++ b/tests/misc-tests/009-subvolume-sync-must-wait/test.sh
@@ -2,7 +2,7 @@
#
# Verify that subvolume sync waits until the subvolume is cleaned
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
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 7915867c..eee01213 100755
--- a/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
+++ b/tests/misc-tests/010-convert-delete-ext2-subvol/test.sh
@@ -3,7 +3,7 @@
# verify that convert rollback finds the ext2_subvolume intact and fails if it
# was partially deleted
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq btrfs-convert
check_prereq btrfs
diff --git a/tests/misc-tests/011-delete-missing-device/test.sh
b/tests/misc-tests/011-delete-missing-device/test.sh
index 8a1b14b1..f6435901 100755
--- a/tests/misc-tests/011-delete-missing-device/test.sh
+++ b/tests/misc-tests/011-delete-missing-device/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# make sure that 'missing' is accepted for device deletion
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/012-find-root-no-result/test.sh
b/tests/misc-tests/012-find-root-no-result/test.sh
index 983a8a1e..fc9e87f9 100755
--- a/tests/misc-tests/012-find-root-no-result/test.sh
+++ b/tests/misc-tests/012-find-root-no-result/test.sh
@@ -3,7 +3,7 @@
# recent fs or balanced fs, whose metadata chunk is the first chunk
# and the only metadata chunk
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq btrfs-find-root
check_prereq btrfs-image
diff --git a/tests/misc-tests/013-subvolume-sync-crash/test.sh
b/tests/misc-tests/013-subvolume-sync-crash/test.sh
index cd445961..a09b65c4 100755
--- a/tests/misc-tests/013-subvolume-sync-crash/test.sh
+++ b/tests/misc-tests/013-subvolume-sync-crash/test.sh
@@ -3,7 +3,7 @@
# Verify that subvolume sync waits until the subvolume is cleaned and does not
# crash at the end
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/014-filesystem-label/test.sh
b/tests/misc-tests/014-filesystem-label/test.sh
index 753aa9ea..a989f136 100755
--- a/tests/misc-tests/014-filesystem-label/test.sh
+++ b/tests/misc-tests/014-filesystem-label/test.sh
@@ -2,7 +2,7 @@
#
# test label settings
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/015-dump-super-garbage/test.sh
b/tests/misc-tests/015-dump-super-garbage/test.sh
index 33fc8332..3e13f9cb 100755
--- a/tests/misc-tests/015-dump-super-garbage/test.sh
+++ b/tests/misc-tests/015-dump-super-garbage/test.sh
@@ -2,7 +2,7 @@
#
# let dump-super dump random data, must not crash
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq btrfs
diff --git a/tests/misc-tests/016-send-clone-src/test.sh
b/tests/misc-tests/016-send-clone-src/test.sh
index 2780ebbd..97f9b59d 100755
--- a/tests/misc-tests/016-send-clone-src/test.sh
+++ b/tests/misc-tests/016-send-clone-src/test.sh
@@ -3,7 +3,7 @@
# test for sending stream size of clone-src option, compare against a send
# stream generated by buggy version
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/017-recv-stream-malformatted/test.sh
b/tests/misc-tests/017-recv-stream-malformatted/test.sh
index d199a72e..3897c2b8 100755
--- a/tests/misc-tests/017-recv-stream-malformatted/test.sh
+++ b/tests/misc-tests/017-recv-stream-malformatted/test.sh
@@ -2,7 +2,7 @@
#
# test receiving stream that's not valid, simple cases
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
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 9ca035f7..d0a8fe90 100755
--- a/tests/misc-tests/018-recv-end-of-stream/test.sh
+++ b/tests/misc-tests/018-recv-end-of-stream/test.sh
@@ -3,7 +3,7 @@
# end of stream conditions: test that no instructions in a stream are still
# received, at least the header must be present
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
b/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
index 182b0cf9..4e3cff29 100755
--- a/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
+++ b/tests/misc-tests/019-receive-clones-on-mounted-subvol/test.sh
@@ -5,7 +5,7 @@
# have an entry with the same name that corresponds to different inodes in each
# snapshot.
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
@@ -14,7 +14,7 @@ check_prereq fssum
setup_root_helper
prepare_test_dev
-FSSUM_PROG="$TOP/fssum"
+FSSUM_PROG="$INTERNAL_BIN/fssum"
srcdir=./send-test-dir
rm -rf "$srcdir"
mkdir -p "$srcdir"
diff --git a/tests/misc-tests/020-fix-superblock-corruption/test.sh
b/tests/misc-tests/020-fix-superblock-corruption/test.sh
index 77c1a5aa..8f3d20fe 100755
--- a/tests/misc-tests/020-fix-superblock-corruption/test.sh
+++ b/tests/misc-tests/020-fix-superblock-corruption/test.sh
@@ -2,7 +2,7 @@
#
# Corrupt primary superblock and restore it using backup superblock.
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq btrfs-select-super
check_prereq btrfs
diff --git a/tests/misc-tests/021-image-multi-devices/test.sh
b/tests/misc-tests/021-image-multi-devices/test.sh
index abf67f90..d78c44fb 100755
--- a/tests/misc-tests/021-image-multi-devices/test.sh
+++ b/tests/misc-tests/021-image-multi-devices/test.sh
@@ -2,7 +2,7 @@
# Test btrfs-image with multiple devices filesystem and verify that restoring
# the created image works against a single device.
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq btrfs-image
check_prereq mkfs.btrfs
diff --git a/tests/misc-tests/022-filesystem-du-on-empty-subvol/test.sh
b/tests/misc-tests/022-filesystem-du-on-empty-subvol/test.sh
index 72cf076f..54365289 100755
--- a/tests/misc-tests/022-filesystem-du-on-empty-subvol/test.sh
+++ b/tests/misc-tests/022-filesystem-du-on-empty-subvol/test.sh
@@ -2,7 +2,7 @@
#
# btrfs fi du should handle empty subvolumes (with ino == 2)
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/023-device-usage-with-missing-device/test.sh
b/tests/misc-tests/023-device-usage-with-missing-device/test.sh
index 3c8ba85c..05894cfe 100755
--- a/tests/misc-tests/023-device-usage-with-missing-device/test.sh
+++ b/tests/misc-tests/023-device-usage-with-missing-device/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# check if 'device slack' is reported as zero when a device is missing
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq btrfs-image
check_prereq mkfs.btrfs
diff --git a/tests/misc-tests/024-inspect-internal-rootid/test.sh
b/tests/misc-tests/024-inspect-internal-rootid/test.sh
index 40e382bb..71e19044 100755
--- a/tests/misc-tests/024-inspect-internal-rootid/test.sh
+++ b/tests/misc-tests/024-inspect-internal-rootid/test.sh
@@ -2,7 +2,7 @@
#
# test commands of inspect-internal rootid
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/025-zstd-compression/test.sh
b/tests/misc-tests/025-zstd-compression/test.sh
index e95dcb36..22795d27 100755
--- a/tests/misc-tests/025-zstd-compression/test.sh
+++ b/tests/misc-tests/025-zstd-compression/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Test zstd compression support on a prebuilt btrfs image
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq btrfs
check_global_prereq md5sum
diff --git a/tests/misc-tests/026-image-non-printable-chars/test.sh
b/tests/misc-tests/026-image-non-printable-chars/test.sh
index 8018586f..50441a21 100755
--- a/tests/misc-tests/026-image-non-printable-chars/test.sh
+++ b/tests/misc-tests/026-image-non-printable-chars/test.sh
@@ -2,7 +2,7 @@
# check that sanitized names with matching crc do not contain unprintable
# characters, namely 0x7f
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/misc-tests/027-subvol-list-deleted-toplevel/test.sh
b/tests/misc-tests/027-subvol-list-deleted-toplevel/test.sh
index ee41d71f..3b73dd36 100755
--- a/tests/misc-tests/027-subvol-list-deleted-toplevel/test.sh
+++ b/tests/misc-tests/027-subvol-list-deleted-toplevel/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# check that the toplevel subvolume is not listed as regular or deleted
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/mkfs-tests.sh b/tests/mkfs-tests.sh
index c8ff8c83..1a84b37c 100755
--- a/tests/mkfs-tests.sh
+++ b/tests/mkfs-tests.sh
@@ -4,13 +4,20 @@
LANG=C
SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+INTERNAL_BIN=$(readlink -f "$SCRIPT_DIR/../")
+TEST_TOP=$(readlink -f "$SCRIPT_DIR/../tests/")
TOP=$(readlink -f "$SCRIPT_DIR/../")
+if ! [ -f "$TOP/btrfs" ];then
+ TOP=$(dirname `which btrfs`)
+fi
TEST_DEV=${TEST_DEV:-}
-RESULTS="$TOP/tests/mkfs-tests-results.txt"
-IMAGE="$TOP/tests/test.img"
+RESULTS="$TEST_TOP/mkfs-tests-results.txt"
+IMAGE="$TEST_TOP/test.img"
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
+export INTERNAL_BIN
+export TEST_TOP
export TOP
export RESULTS
export LANG
@@ -25,7 +32,7 @@ check_kernel_support
# The tests are driven by their custom script called 'test.sh'
-for i in $(find "$TOP/tests/mkfs-tests" -maxdepth 1 -mindepth 1 -type d
\
+for i in $(find "$TEST_TOP/mkfs-tests" -maxdepth 1 -mindepth 1 -type d \
${TEST:+-name "$TEST"} | sort)
do
echo " [TEST/mkfs] $(basename $i)"
@@ -40,5 +47,5 @@ do
_fail "test failed for case $(basename $i)"
fi
fi
- cd "$TOP"
+ cd "$TEST_TOP"
done
diff --git a/tests/mkfs-tests/001-basic-profiles/test.sh
b/tests/mkfs-tests/001-basic-profiles/test.sh
index 854ee007..134b30b3 100755
--- a/tests/mkfs-tests/001-basic-profiles/test.sh
+++ b/tests/mkfs-tests/001-basic-profiles/test.sh
@@ -2,7 +2,7 @@
# test various blockgroup profile combinations, use loop devices as block
# devices
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
b/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
index 37846234..1932720e 100755
--- a/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
+++ b/tests/mkfs-tests/002-no-force-mixed-on-small-volume/test.sh
@@ -2,7 +2,7 @@
#
# Verify that we do not force mixed block groups on small volumes anymore
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
diff --git a/tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh
b/tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh
index 074fc22e..071202f4 100755
--- a/tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh
+++ b/tests/mkfs-tests/003-mixed-with-wrong-nodesize/test.sh
@@ -2,7 +2,7 @@
#
# Mixed mode needs equal sectorsize and nodesize
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
diff --git a/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
b/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
index 7038c8ea..2661efed 100755
--- a/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
+++ b/tests/mkfs-tests/004-rootdir-keeps-size/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# make sure that mkfs.btrfs --rootsize does not change size of the image
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
@@ -16,7 +16,7 @@ test_mkfs_with_size() {
run_check truncate -s$size $TEST_DEV
imgsize=$(run_check_stdout stat --format=%s $TEST_DEV)
run_check $SUDO_HELPER $TOP/mkfs.btrfs -f \
- --rootdir $TOP/Documentation \
+ --rootdir $INTERNAL_BIN/Documentation \
$TEST_DEV
tmp=$(run_check_stdout stat --format=%s $TEST_DEV)
if ! [ "$imgsize" = "$tmp" ]; then
diff --git a/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh
b/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh
index 5bdf50e0..cbb35210 100755
--- a/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh
+++ b/tests/mkfs-tests/005-long-device-name-for-ssd/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# a long device name must pass the SSD test
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
diff --git a/tests/mkfs-tests/006-partitioned-loopdev/test.sh
b/tests/mkfs-tests/006-partitioned-loopdev/test.sh
index 0c77e5cd..bca2bd00 100755
--- a/tests/mkfs-tests/006-partitioned-loopdev/test.sh
+++ b/tests/mkfs-tests/006-partitioned-loopdev/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# recognize partitioned loop devices
-source $TOP/tests/common
+source $TEST_TOP/common
if ! losetup --help | grep -q 'partscan'; then
_not_run "losetup --partscan not available"
diff --git a/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
b/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
index 3980414f..e520fde6 100755
--- a/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
+++ b/tests/mkfs-tests/007-mix-nodesize-sectorsize/test.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# iterate over nodesize and sectorsize combinations
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/mkfs-tests/008-sectorsize-nodesize-combination/test.sh
b/tests/mkfs-tests/008-sectorsize-nodesize-combination/test.sh
index 955cd2b1..f6eca906 100755
--- a/tests/mkfs-tests/008-sectorsize-nodesize-combination/test.sh
+++ b/tests/mkfs-tests/008-sectorsize-nodesize-combination/test.sh
@@ -4,7 +4,7 @@
# only do mkfs and fsck check, no mounting as
# sub/multi-pagesize is not supported yet
-source $TOP/tests/common
+source $TEST_TOP/common
check_prereq mkfs.btrfs
check_prereq btrfs
diff --git a/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
b/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
index d327a0d9..a94d5209 100755
--- a/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
+++ b/tests/mkfs-tests/009-special-files-for-rootdir/test.sh
@@ -6,7 +6,7 @@
#
# Note: sock type is skipped in this test
-source "$TOP/tests/common"
+source "$TEST_TOP/common"
check_prereq mkfs.btrfs
check_prereq btrfs
--
2.14.3
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
