commit 9ac95d3c1c319a4b6eab73ed4739320a93bbea4d
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Jul 01 01:51:37 2017 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Wed Jul 05 00:10:25 2017 -0400
tree 9dacbf3d19f71f969b3b7824ae503b81af17a3af
parent 68ab43d8b7daf12f93721a1906d4a776b32c5923

ci: expand Travis-CI build matrix and use two parallel build jobs

Change-Id: I7dbba5bcd63274daa9b0da2ee9d631a55c1eca9e

.jenkins.d/10-build.sh

diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index a9c3446..1c310a0 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -11,34 +11,34 @@
 git submodule update
 
 # Cleanup
-sudo ./waf -j1 --color=yes distclean
+sudo ./waf --color=yes distclean
 
 if [[ $JOB_NAME != *"code-coverage" && $JOB_NAME != *"limited-build" ]]; then
   # Configure/build in optimized mode with tests
-  ./waf -j1 --color=yes configure --with-tests
-  ./waf -j1 --color=yes build
+  ./waf --color=yes configure --with-tests
+  ./waf --color=yes build -j${WAF_JOBS:-1}
 
   # Cleanup
-  sudo ./waf -j1 --color=yes distclean
+  sudo ./waf --color=yes distclean
 
   # Configure/build in optimized mode without tests
-  ./waf -j1 --color=yes configure
-  ./waf -j1 --color=yes build
+  ./waf --color=yes configure
+  ./waf --color=yes build -j${WAF_JOBS:-1}
 
   # Cleanup
-  sudo ./waf -j1 --color=yes distclean
+  sudo ./waf --color=yes distclean
 fi
 
 # Configure/build in debug mode with tests and without precompiled headers
 if [[ $JOB_NAME == *"code-coverage" ]]; then
     COVERAGE="--with-coverage"
-elif ! has OSX-10.9 $NODE_LABELS && ! has OSX-10.11 $NODE_LABELS; then
+elif [[ -n $BUILD_WITH_ASAN || -z $TRAVIS ]]; then
     ASAN="--with-sanitizer=address"
 fi
-./waf -j1 --color=yes configure --debug --with-tests --without-pch $COVERAGE $ASAN
-./waf -j1 --color=yes build
+./waf --color=yes configure --debug --with-tests --without-pch $COVERAGE $ASAN
+./waf --color=yes build -j${WAF_JOBS:-1}
 
 # (tests will be run against debug version)
 
 # Install
-sudo ./waf -j1 --color=yes install
+sudo ./waf --color=yes install