commit 9412d1267802a521319e271a78f6df5873b55ddb
author Davide Pesavento <davide.pesavento@lip6.fr> Tue Jan 02 21:52:09 2018 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Sun Jan 07 15:25:34 2018 -0500
tree ff2495cc7bb2bad767c9262ccbb9b3c9cec469e3
parent 5afbb0b3dde7efe8b2fc9caf9898db3e0499e0bc

ci: update Travis-CI configuration

 * Re-enable ASan with gcc-7
 * Add clang-6.0 to the build matrix (allowed to fail)
 * Remove unsupported OSX-10.10 configuration
 * Upgrade xcode9 to xcode9.2
 * Add testing of openssl 1.1 on osx (allowed to fail)
 * Various simplifications

Change-Id: I3cdfcf78e6a9be66d1063fee710528698ad90bca

.jenkins.d/00-deps.sh

diff --git a/.jenkins.d/00-deps.sh b/.jenkins.d/00-deps.sh
index 66dafb4..79d65a2 100755
--- a/.jenkins.d/00-deps.sh
+++ b/.jenkins.d/00-deps.sh
@@ -7,7 +7,13 @@
 set -x
 
 if has OSX $NODE_LABELS; then
-    FORMULAE=(boost openssl pkg-config)
+    FORMULAE=(boost pkg-config)
+    if [[ -n $USE_OPENSSL_1_1 ]]; then
+        FORMULAE+=(openssl@1.1)
+    else
+        FORMULAE+=(openssl)
+    fi
+
     brew update
     if [[ -n $TRAVIS ]]; then
         # travis images come with a large number of brew packages

.jenkins.d/10-build.sh

diff --git a/.jenkins.d/10-build.sh b/.jenkins.d/10-build.sh
index 6844e93..fe2bfa0 100755
--- a/.jenkins.d/10-build.sh
+++ b/.jenkins.d/10-build.sh
@@ -11,19 +11,28 @@
 sudo rm -f /usr/local/lib/libndn-cxx*
 sudo rm -f /usr/local/lib/pkgconfig/libndn-cxx.pc
 
+if [[ $JOB_NAME == *"code-coverage" ]]; then
+    COVERAGE="--with-coverage"
+elif [[ -z $DISABLE_ASAN ]]; then
+    ASAN="--with-sanitizer=address"
+fi
+if [[ -n $USE_OPENSSL_1_1 ]] && has OSX $NODE_LABELS; then
+    OPENSSL="--with-openssl=/usr/local/opt/openssl@1.1"
+fi
+
 # Cleanup
 sudo env "PATH=$PATH" ./waf --color=yes distclean
 
 if [[ $JOB_NAME != *"code-coverage" && $JOB_NAME != *"limited-build" ]]; then
   # Configure/build static library in optimized mode with tests
-  ./waf --color=yes configure --enable-static --disable-shared --with-tests
+  ./waf --color=yes configure --enable-static --disable-shared --with-tests $OPENSSL
   ./waf --color=yes build -j${WAF_JOBS:-1}
 
   # Cleanup
   sudo env "PATH=$PATH" ./waf --color=yes distclean
 
   # Configure/build static and shared library in optimized mode without tests
-  ./waf --color=yes configure --enable-static --enable-shared
+  ./waf --color=yes configure --enable-static --enable-shared $OPENSSL
   ./waf --color=yes build -j${WAF_JOBS:-1}
 
   # Cleanup
@@ -31,12 +40,8 @@
 fi
 
 # Configure/build shared library in debug mode with tests/examples and without precompiled headers
-if [[ $JOB_NAME == *"code-coverage" ]]; then
-    COVERAGE="--with-coverage"
-elif [[ -n $BUILD_WITH_ASAN || -z $TRAVIS ]]; then
-    ASAN="--with-sanitizer=address"
-fi
-./waf --color=yes configure --disable-static --enable-shared --debug --with-tests --with-examples --without-pch $COVERAGE $ASAN
+./waf --color=yes configure --disable-static --enable-shared --debug --with-tests \
+                            --with-examples --without-pch $ASAN $COVERAGE $OPENSSL
 ./waf --color=yes build -j${WAF_JOBS:-1}
 
 # (tests will be run against debug version)