From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Mon, 16 Feb 2015 15:57:41 +0000 (-0500)
Subject: Fix: check if test plan exist before running them
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=22e099b5f6ff27b9097ae8c13afe222474e3fda8;p=lttng-ci.git

Fix: check if test plan exist before running them
---

diff --git a/lttng-ust/lttng-ust-master.sh b/lttng-ust/lttng-ust-master.sh
index f792c17..5e1b644 100755
--- a/lttng-ust/lttng-ust-master.sh
+++ b/lttng-ust/lttng-ust-master.sh
@@ -87,7 +87,12 @@ mkdir -p $WORKSPACE/tap/unit
 
 cd $BUILD_PATH/tests
 
-prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
+if [ -e $BUILD_PATH/tests/unit_tests ]; then
+	prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
+else
+	echo "Test file:$BUILD_PATH/tests/unit_tests missing"
+	exit 1
+fi
 
 # TAP plugin is having a hard time with .yml files.
 rm -f $WORKSPACE/tap/unit/meta.yml
diff --git a/lttng-ust/lttng-ust-stable-2.5.sh b/lttng-ust/lttng-ust-stable-2.5.sh
index 3d52a49..3ef2ddf 100755
--- a/lttng-ust/lttng-ust-stable-2.5.sh
+++ b/lttng-ust/lttng-ust-stable-2.5.sh
@@ -43,7 +43,12 @@ mkdir -p $WORKSPACE/tap/unit
 
 cd $WORKSPACE/tests
 
-prove --merge --exec '' - < $WORKSPACE/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
+if [ -e $BUILD_PATH/tests/unit_tests ]; then
+	prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
+else
+	echo "Test file:$BUILD_PATH/tests/unit_tests missing"
+	exit 1
+fi
 
 # TAP plugin is having a hard time with .yml files.
 rm -f $WORKSPACE/tap/unit/meta.yml
diff --git a/lttng-ust/lttng-ust-stable-2.6.sh b/lttng-ust/lttng-ust-stable-2.6.sh
index fb1fec4..88a6edb 100755
--- a/lttng-ust/lttng-ust-stable-2.6.sh
+++ b/lttng-ust/lttng-ust-stable-2.6.sh
@@ -83,7 +83,12 @@ mkdir -p $WORKSPACE/tap/unit
 
 cd $BUILD_PATH/tests
 
-prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
+if [ -e $BUILD_PATH/tests/unit_tests ]; then
+	prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
+else
+	echo "Test file:$BUILD_PATH/tests/unit_tests missing"
+	exit 1
+fi
 
 # TAP plugin is having a hard time with .yml files.
 rm -f $WORKSPACE/tap/unit/meta.yml