X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=babeltrace%2Fbabeltrace-master.sh;h=eb75863e32fcf2ca0ffdce1c69aba9c318372c3e;hb=d901a9ea76fbf9e038749d778c23abead6a572ae;hp=8c3ac393d3fd4b6db6ce21d2951ddb04041c1f47;hpb=dfce032b13bc96a09a27d09e355bf4b4d71484b4;p=lttng-ci.git

diff --git a/babeltrace/babeltrace-master.sh b/babeltrace/babeltrace-master.sh
index 8c3ac39..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