Merge branch 'sb/indent-heuristic-optim'

diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index 109ef280da9884027f17fe7f233b6b818bd71393..06970f72134fae6f6fd6df9afd93a7c7f064f495 100755 (executable)
--- a/ci/lib-travisci.sh
+++ b/ci/lib-travisci.sh
@@ -97,8 +97,11 @@ fi
 export DEVELOPER=1
 export DEFAULT_TEST_TARGET=prove
 export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
-export GIT_TEST_OPTS="--verbose-log -x"
+export GIT_TEST_OPTS="--verbose-log -x --immediate"
 export GIT_TEST_CLONE_2GB=YesPlease
+if [ "$jobname" = linux-gcc ]; then
+       export CC=gcc-8
+fi
 
 case "$jobname" in
 linux-clang|linux-gcc)