i18n: make GETTEXT_POISON a runtime option

diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index 109ef280da9884027f17fe7f233b6b818bd71393..69dff4d1ecb4b21c32f8127d78a87a925e9390c5 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)
@@ -120,7 +123,7 @@ osx-clang|osx-gcc)
        # Travis CI OS X
        export GIT_SKIP_TESTS="t9810 t9816"
        ;;
-GETTEXT_POISON)
-       export GETTEXT_POISON=YesPlease
+GIT_TEST_GETTEXT_POISON)
+       export GIT_TEST_GETTEXT_POISON=YesPlease
        ;;
 esac