X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fmisc-tests.sh;h=dad397ecaeec028b0b18e93710c86384148a75b2;hb=31ceca8ddd0039550821227a7990f13622c725a7;hp=fed1b36ceaca858849bb9007b8b415b67d2d0d8e;hpb=cebf3b37228cbde730a5448ad2dfb044600d5e03;p=platform%2Fupstream%2Fbtrfs-progs.git

diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh
index fed1b36..dad397e 100755
--- a/tests/misc-tests.sh
+++ b/tests/misc-tests.sh
@@ -4,11 +4,26 @@
 
 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`)
+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/misc-tests-results.txt"
@@ -21,8 +36,8 @@ export TEST_TOP
 export TOP
 export RESULTS
 export LANG
-export TEST_DEV
 export IMAGE
+export TEST_DEV
 
 rm -f "$RESULTS"
 
@@ -31,7 +46,6 @@ check_prereq btrfs-corrupt-block
 check_prereq btrfs-image
 check_prereq btrfstune
 check_prereq btrfs
-check_prereq btrfs-zero-log
 check_prereq btrfs-find-root
 check_prereq btrfs-select-super
 check_kernel_support