diff options
| author | Gu Jinxiang <gujx@cn.fujitsu.com> | 2018-02-08 14:34:19 +0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-02-13 15:41:32 +0100 |
| commit | cebf3b37228cbde730a5448ad2dfb044600d5e03 (patch) | |
| tree | ecc36b048a74d11374ac00bb6e9ab5ab2a166b0f /tests/convert-tests.sh | |
| parent | 04cd2c0bcac7129026c80661933b4ab97d4ab9ca (diff) | |
btrfs-progs: introduce TEST_TOP and INTERNAL_BIN for tests
Use TEST_TOP as base for tests to reference any files, this will be used
for git and external testsuite.
INTERNAL_BIN is needed for referencing binaries that could reside in
different paths in git vs external testsuite.
Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
[ add quotes around sourced files, update changelog ]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'tests/convert-tests.sh')
| -rwxr-xr-x | tests/convert-tests.sh | 15 |
1 files changed, 10 insertions, 5 deletions
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" |