From 28c11f2785f54c05d1a89cbb141eb59fd29c0fa0 Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Thu, 19 Feb 2015 16:05:00 -0500
Subject: [PATCH] Babeltrace:use new variable TEST_PLAN_PATH for test plan base
 path.

Normally we use WORKSPACE as base test plan directory except for
dist build where we want to test independent tarball.

This behaviour should waterfall on tools and others
---
 babeltrace/babeltrace-master.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/babeltrace/babeltrace-master.sh b/babeltrace/babeltrace-master.sh
index 13c4ec6..eb75863 100755
--- a/babeltrace/babeltrace-master.sh
+++ b/babeltrace/babeltrace-master.sh
@@ -35,6 +35,8 @@ esac
 # before continuing
 
 BUILD_PATH=$WORKSPACE
+TEST_PLAN_PATH=$WORKSPACE
+
 case "$build" in
 	oot)
 		echo "Out of tree build"
@@ -59,9 +61,11 @@ case "$build" in
 		tar xvf *.tar.* --strip 1
 
 		$BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
+
+		# Set test plan to dist tar
+		TEST_PLAN_PATH=$BUILD_PATH
 		;;
 	*)
-		BUILD_PATH=$WORKSPACE
 		echo "Standard tree build"
 		$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
 		;;
@@ -76,8 +80,8 @@ mkdir -p $WORKSPACE/tap
 cd $BUILD_PATH/tests
 
 # Run make check tests
-if [ -e $BUILD_PATH/tests/tests ]; then
-	prove --merge --exec '' - < $BUILD_PATH/tests/tests --archive $WORKSPACE/tap/ || true
+if [ -e $TEST_PLAN_PATH/tests/tests ]; then
+	prove --merge --exec '' - < $TEST_PLAN_PATH/tests/tests --archive $WORKSPACE/tap/ || true
 else
 	echo "Missing test plan"
 	exit 1
-- 
2.34.1