diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2019-12-10 00:31:05 +0100 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2019-12-10 11:43:40 +0100 |
| commit | 7a2afc8985b44dc23710cf0cc82de708ca321a29 (patch) | |
| tree | bade73b96166f8cd7cffe36d354737c42d17bf65 /.travis.yml | |
| parent | 08935bba69e3581d5e30289f1e318e6a96b55f37 (diff) | |
.travis.yml: Use SCONSFLAGS for scons builds
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 1306ad3ae5..ed2383957e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,9 @@ language: c++ # TODO(2019-07-21): Add "ffmpeg=1" if FFmpeg 4.x becomes available in Ubuntu env: global: - - SCONS_MIXXX_COMMON_FLAGS="-j4 test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" + # For SCons builds + - SCONSFLAGS="test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0" + # For CMake builds - CMAKE_MIXXX_COMMON_FLAGS="-DMAD=ON -DFAAD=ON -DOPUS=ON -DMODPLUG=ON -DWAVPACK=ON -DHSS1394=OFF" - GTEST_COLOR=1 - CTEST_OUTPUT_ON_FAILURE=1 @@ -35,11 +37,10 @@ jobs: dist: xenial compiler: gcc # Ubuntu Xenial build prerequisites - env: SCONS_MIXXX_EXTRA_FLAGS="localecompare=1" before_install: - sudo apt-get install -y scons install: - - scons $SCONS_MIXXX_COMMON_FLAGS $SCONS_MIXX_EXTRA_FLAGS + - scons -j "$(nproc)" localecompare=1 script: # NOTE(sblaisot): 2018-01-02 removing gdb wrapper on linux due to a bug in # return code in order to avoid having a successful build when a test fail. @@ -84,7 +85,7 @@ jobs: - export QTDIR="$(find /usr/local/Cellar/qt -d 1 | tail -n 1)" - echo "QTDIR=$QTDIR" install: - - scons $SCONS_MIXXX_COMMON_FLAGS $SCONS_MIXXX_EXTRA_FLAGS + - scons -j "$(sysctl -n hw.ncpu)" script: # lldb doesn't provide an easy way to exit 1 on error: # https://bugs.llvm.org/show_bug.cgi?id=27326 |