commit f085ed10e5b6d10ce14a5f3a4f49da1f84d0b700
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Jun 30 14:59:52 2017 -0400
committer Davide Pesavento <davide.pesavento@lip6.fr> Fri Jun 30 14:59:52 2017 -0400
tree c12a83bafe62acfa7fadc7a6ea3ae3d375ce5466
parent 1eecc17e16fbb40b20b4c814c35946c7b1c9b590

ci: greatly expand Travis-CI build matrix

Change-Id: I2455e2751db9cd4f660c38ad4696925b1fda5cd8

.jenkins.d/00-deps.sh

diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index eb4e968..6448fbe 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -24,12 +24,12 @@
 
 if has Ubuntu $NODE_LABELS; then
     sudo apt-get -qq update
-    sudo apt-get -qq install build-essential pkg-config libboost-all-dev \
+    sudo apt-get -qy install build-essential pkg-config libboost-all-dev \
                              libcrypto++-dev libsqlite3-dev libssl-dev \
                              libpcap-dev
 
     if [[ $JOB_NAME == *"code-coverage" ]]; then
-        sudo apt-get -qq install lcov libgd-perl python-setuptools
+        sudo apt-get -qy install lcov libgd-perl python-setuptools
         sudo easy_install --upgrade gcovr
     fi
 fi

.jenkins.d/10-build.sh

diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index f0df3eb..6e42480 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -28,7 +28,7 @@
 # Configure/build in debug mode with tests
 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 $COVERAGE $ASAN