diff options
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rwxr-xr-x | ci/travis_script.sh | 8 |
3 files changed, 12 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index f5a32a6..22d76e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,10 @@ matrix: compiler: gcc include: # Test cross builds separately, they do not use the global compiler + # Also hijack one cross build to test long commandline handling codepath (and avoid overloading Travis) - os: linux compiler: gcc - env: RUN_TESTS_ARGS="--cross ubuntu-armhf.txt --cross linux-mingw-w64-64bit.txt" + env: RUN_TESTS_ARGS="--cross ubuntu-armhf.txt --cross linux-mingw-w64-64bit.txt" MESON_RSP_THRESHOLD=0 - os: linux compiler: gcc env: RUN_TESTS_ARGS="--cross ubuntu-armhf.txt --cross linux-mingw-w64-64bit.txt" MESON_ARGS="--unity=on" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 066f1a5..de956c8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -22,6 +22,7 @@ jobs: arch: x86 compiler: msvc2017 backend: ninja + MESON_RSP_THRESHOLD: 0 vc2017x64vs: arch: x64 compiler: msvc2017 @@ -138,6 +139,7 @@ jobs: gccx64ninja: MSYSTEM: MINGW64 MSYS2_ARCH: x86_64 + MESON_RSP_THRESHOLD: 0 compiler: gcc clangx64ninja: MSYSTEM: MINGW64 diff --git a/ci/travis_script.sh b/ci/travis_script.sh index a91a5dd..bdfd4c2 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 |