X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=babeltrace%2Fbabeltrace-master.sh;h=eb75863e32fcf2ca0ffdce1c69aba9c318372c3e;hb=28c11f2785f54c05d1a89cbb141eb59fd29c0fa0;hp=99417a2701a183b3cad0375773a2e8f207f6928e;hpb=aad6ac9072f76adb34d053ba5319e53067ea94c7;p=lttng-ci.git

diff --git a/babeltrace/babeltrace-master.sh b/babeltrace/babeltrace-master.sh
index 99417a2..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,15 +61,17 @@ 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
 		;;
 esac
 
-make V=1
+make
 make install
 
 rm -rf $WORKSPACE/tap
@@ -76,7 +80,12 @@ mkdir -p $WORKSPACE/tap
 cd $BUILD_PATH/tests
 
 # Run make check tests
-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
+fi
 
 # TAP plugin is having a hard time with .yml files.
 rm -f $WORKSPACE/tap/meta.yml