From b68488c148722da80983e7dd80dcfdc9d546d5b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Milk?= <rene.milk@wwu.de>
Date: Thu, 22 Feb 2018 20:48:10 +0100
Subject: [PATCH] [ci] update from super templates
---
.travis.script.bash | 6 +++---
.travis.test_python.bash | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/.travis.script.bash b/.travis.script.bash
index ae717cad9..825795255 100755
--- a/.travis.script.bash
+++ b/.travis.script.bash
@@ -12,9 +12,9 @@ source ${SUPERDIR}/scripts/bash/retry_command.bash
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} configure
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
if [ x"${TESTS}" == x ] ; then
- ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_binaries
+ ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_binaries
else
- ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_binaries_builder_${TESTS}
+ ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_binaries_builder_${TESTS}
fi
source ${OPTS}
@@ -22,7 +22,7 @@ CTEST="ctest -V --timeout ${DXT_TEST_TIMEOUT:-300} -j ${DXT_TEST_PROCS:-2}"
if [ x"${TESTS}" == x ] ; then
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST}
- ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 headercheck
+ ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} headercheck
else
# with binning headercheck is included in building tests
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${CTEST} -L "^builder_${TESTS}$"
diff --git a/.travis.test_python.bash b/.travis.test_python.bash
index 98ac35a0e..264c4b430 100755
--- a/.travis.test_python.bash
+++ b/.travis.test_python.bash
@@ -11,8 +11,7 @@ source ${SUPERDIR}/scripts/bash/retry_command.bash
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} configure
${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
-${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v bindings
-
-${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ninja -j1 -v test_python
+${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} bindings
+${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_python
# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
\ No newline at end of file
--
GitLab