projects
/
lttng-ci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Babeltrace:use new variable TEST_PLAN_PATH for test plan base path.
[lttng-ci.git]
/
babeltrace
/
babeltrace-master.sh
diff --git
a/babeltrace/babeltrace-master.sh
b/babeltrace/babeltrace-master.sh
index b37c4decbf420a9a9a4780537ab95ff1a3e7fca0..eb75863e32fcf2ca0ffdce1c69aba9c318372c3e 100755
(executable)
--- a/
babeltrace/babeltrace-master.sh
+++ b/
babeltrace/babeltrace-master.sh
@@
-35,6
+35,8
@@
esac
# before continuing
BUILD_PATH=$WORKSPACE
# before continuing
BUILD_PATH=$WORKSPACE
+TEST_PLAN_PATH=$WORKSPACE
+
case "$build" in
oot)
echo "Out of tree build"
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
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
;;
echo "Standard tree build"
$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
;;
@@
-76,7
+80,12
@@
mkdir -p $WORKSPACE/tap
cd $BUILD_PATH/tests
# Run make check tests
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
# TAP plugin is having a hard time with .yml files.
rm -f $WORKSPACE/tap/meta.yml
This page took
0.024661 seconds
and
4
git commands to generate.