diff --git a/.travis.yml b/.travis.yml index 81bd91d68..6dd229211 100644 --- a/.travis.yml +++ b/.travis.yml @@ -135,9 +135,11 @@ before_script: script: - mkdir -p build - cd build - - cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../src - - CONFIG_FILE=DartConfiguration.tcl; - sed -i "s/^MakeCommand:\(.*\)/MakeCommand:\1 -j 1/" $CONFIG_FILE; + - if [[ $MEMCHECK == TRUE ]]; then + cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -G Ninja ../src; + else + cmake -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ../src; + fi - if [[ $CMAKE_BUILD_TYPE == DEBUG || $CMAKE_BUILD_TYPE == RELEASE || $CMAKE_BUILD_TYPE == TESTCOV ]]; then SITE=Ubuntu12.04@Travis; GIT_COMMIT=`git log --oneline -n 1 | cut -d ' ' -f 1`; @@ -151,7 +153,7 @@ script: sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE; sed -i "s/BuildName:.*/BuildName:$BUILD_NAME/" $CONFIG_FILE; if [[ $MEMCHECK == TRUE ]]; then - ninja -j 1; + ninja; else ctest -D ExperimentalConfigure; sed -i "s/^Site:.*/Site:$SITE/" $CONFIG_FILE;