X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fcli-tests.sh;h=9e0fbae4e37357b237b00c0403caa87de3009524;hb=e875cd98e38f9fdc7f812a7575a3a2afd6b6094b;hp=b981f83351ef95d1521b349101718cc61851205f;hpb=cebf3b37228cbde730a5448ad2dfb044600d5e03;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/tests/cli-tests.sh b/tests/cli-tests.sh
index b981f83..9e0fbae 100755
--- a/tests/cli-tests.sh
+++ b/tests/cli-tests.sh
@@ -4,10 +4,26 @@
 
 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`)
+if [ -z "$TOP" ]; then
+	TOP=$(readlink -f "$SCRIPT_DIR/../")
+	if [ -f "$TOP/configure.ac" ]; then
+		# inside git
+		TEST_TOP="$TOP/tests/"
+		INTERNAL_BIN="$TOP"
+	else
+		# external, defaults to system binaries
+		TOP=$(dirname `which btrfs`)
+		TEST_TOP="$SCRIPT_DIR"
+		INTERNAL_BIN="$TEST_TOP"
+	fi
+else
+	# assume external, TOP set from commandline
+	TEST_TOP="$SCRIPT_DIR"
+	INTERNAL_BIN="$TEST_TOP"
+fi
+if ! [ -x "$TOP/btrfs" ]; then
+	echo "ERROR: cannot execute btrfs from TOP=$TOP"
+	exit 1
 fi
 TEST_DEV=${TEST_DEV:-}
 RESULTS="$TEST_TOP/cli-tests-results.txt"
@@ -15,6 +31,7 @@ IMAGE="$TEST_TOP/test.img"
 
 source "$TEST_TOP/common"
 
+export INTERNAL_BIN
 export TEST_TOP
 export TOP
 export RESULTS