diff options
| author | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
|---|---|---|
| committer | John Ericson <git@JohnEricson.me> | 2020-08-03 11:48:27 -0400 |
| commit | eaf6343c065842b9719793066e765b2e5f1c2f3b (patch) | |
| tree | 1bfeac5297ba489721e704e63c28f33d0fb98990 /ci/travis_script.sh | |
| parent | 87aa98c1787d800145853a8e84654e4c54ee1078 (diff) | |
| parent | 70edf82c6c77902cd64f44848302bbac92d611d8 (diff) | |
| download | meson-lang-enum.tar.gz | |
Merge remote-tracking branch 'upstream/master' into lang-enumlang-enum
Diffstat (limited to 'ci/travis_script.sh')
| -rwxr-xr-x | ci/travis_script.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ci/travis_script.sh b/ci/travis_script.sh index a91a5dd1b..bdfd4c202 100755 --- a/ci/travis_script.sh +++ b/ci/travis_script.sh @@ -23,6 +23,10 @@ export CXX=$CXX export OBJC=$CC export OBJCXX=$CXX export PATH=/root/tools:$PATH +if test "$MESON_RSP_THRESHOLD" != "" +then + export MESON_RSP_THRESHOLD=$MESON_RSP_THRESHOLD +fi source /ci/env_vars.sh cd /root @@ -55,5 +59,9 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OBJC=$CC export OBJCXX=$CXX export PATH=$HOME/tools:/usr/local/opt/qt/bin:$PATH:$(brew --prefix llvm)/bin + if test "$MESON_RSP_THRESHOLD" != "" + then + export MESON_RSP_THRESHOLD=$MESON_RSP_THRESHOLD + fi ./run_tests.py $RUN_TESTS_ARGS --backend=ninja -- $MESON_ARGS fi |