diff options
Diffstat (limited to 'scripts/travis.sh')
| -rwxr-xr-x | scripts/travis.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/travis.sh b/scripts/travis.sh index 8b79930aa0..8ae9a7a502 100755 --- a/scripts/travis.sh +++ b/scripts/travis.sh @@ -17,6 +17,14 @@ check_and_report() { ) } +# Travis reports back that it has 32-cores via /proc/cpuinfo, but it's not +# what we really have available. According to their documentation, it only has +# 1.5 virtual cores. +# See: +# http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM +# for more information. +alias make="make -j2" + if [ "$CC" = "clang" ]; then # force using the version installed by 'travis-setup.sh' export CC=/usr/bin/clang @@ -46,9 +54,8 @@ if [ "$CC" = "clang" ]; then check_and_report make install else - export BUSTED_OUTPUT_TYPE="TAP" export SKIP_EXEC=1 + make CMAKE_EXTRA_FLAGS="-DBUSTED_OUTPUT_TYPE=TAP" make cmake make unittest fi - |