summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDane Springmeyer <dane@mapbox.com>2014-10-29 23:58:22 -0400
committerDane Springmeyer <dane@mapbox.com>2014-10-29 23:58:22 -0400
commit543d4568d582742ab036495af09222471e5e54ce (patch)
tree64d9f0233bac5e06318ef322008dc7726ab1c536 /scripts
parentcb7c57dae6d6b4593d67bfdcc4a0758e6a956687 (diff)
downloadqtlocation-mapboxgl-543d4568d582742ab036495af09222471e5e54ce.tar.gz
more build concurrency
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis_before_install.sh2
-rwxr-xr-xscripts/travis_script.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh
index 7c308d5800..0cf21e0fe7 100755
--- a/scripts/travis_before_install.sh
+++ b/scripts/travis_before_install.sh
@@ -40,7 +40,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
echo $CXXFLAGS
echo $CFLAGS
echo $LDFLAGS
- make && sudo make install && \
+ make -j$(nproc) && sudo make install && \
cd ../
mapbox_time "install_opengl" \
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index f306dbcb79..8e2f921638 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -8,10 +8,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
# build & test Linux
#
mapbox_time "compile_program" \
- make linux -j4 BUILDTYPE=${BUILDTYPE}
+ make linux -j$(nproc) BUILDTYPE=${BUILDTYPE}
mapbox_time "compile_tests" \
- make test -j4 BUILDTYPE=${BUILDTYPE}
+ make test -j$(nproc) BUILDTYPE=${BUILDTYPE}
mapbox_time "run_tests" \
./scripts/run_tests.sh