[travis] Only build outside ctest on master

qgis · Aug 10, 2017 · 349c197 · 349c197
1 parent e6c7421
commit 349c197
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.ci/travis/linux/script.sh b/.ci/travis/linux/script.sh
@@ -29,9 +29,16 @@ export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
 
 export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
 
-pushd build
-$CTEST_BUILD_COMMAND
-popd
+# This works around an issue where travis would timeout on master because
+# when make is run inside ctest no output is generated. At the current time
+# nobody know why, but at least this workaround gets travis results for master
+# back. Better approaches VERY welcome.
+if [[ ${TRAVIS_BRANCH} == "master" ]];
+then
+    pushd build
+    $CTEST_BUILD_COMMAND
+    popd
+fi
 
 python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py \
   xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure