diff --git a/.travis.script.bash b/.travis.script.bash index ae717cad9ee7468e451ade7f5d243a9222357abc..82579525536bf5dd448bde598b83e64ff588effc 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 98ac35a0ee26ebac5bb4cae582074ee45d965524..264c4b430535201cd6ff7b58e9908fabfba1aaa8 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