From 1af851e7911cb3d87dc2e816e475d89f4766809a Mon Sep 17 00:00:00 2001
From: "W.C.A. Wijngaards" <wouter@nlnetlabs.nl>
Date: Tue, 23 Mar 2021 16:27:49 +0100
Subject: [PATCH] Travis, fix location of libexpat, stop on error.

---
 .travis.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ef0867e2..b6f62223e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ jobs:
       arch: amd64
       env:
         - TEST_OSX=yes
-        - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl"
+        - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl --with-libexpat=/usr/local/opt/expat"
         - TEST_ANALYZER=yes
         - HOMEBREW_NO_AUTO_UPDATE=1
     - os: linux
@@ -65,7 +65,7 @@ jobs:
       env:
         - TEST_OSX=yes
         - TEST_LIBEVENT=yes
-        - CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl --with-libevent=/usr/local/opt/libevent"
+        - CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl --with-libevent=/usr/local/opt/libevent --with-libexpat=/usr/local/opt/expat"
         - HOMEBREW_NO_AUTO_UPDATE=1
     - os: linux
       name: UBsan, GCC on Linux, Amd64
@@ -327,13 +327,13 @@ script:
   - |
     if [ "$TEST_UBSAN" = "yes" ]; then
       export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=undefined -fno-sanitize-recover"
-      ./configure
-      make -j 2
+      ./configure && \
+      make -j 2 && \
       make test
     elif [ "$TEST_ASAN" = "yes" ]; then
       export CFLAGS="-DNDEBUG -g2 -O3 -fsanitize=address"
-      ./configure
-      make -j 2
+      ./configure && \
+      make -j 2 && \
       make test
     elif [ "$TEST_IOS" = "yes" ]; then
       export AUTOTOOLS_BUILD="$(./config.guess)"
@@ -345,8 +345,8 @@ script:
         --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \
         --prefix="$IOS_PREFIX" \
         --with-ssl="$IOS_PREFIX" --disable-gost \
-        --with-libexpat="$IOS_PREFIX";
-      make -j 2
+        --with-libexpat="$IOS_PREFIX"; && \
+      make -j 2 && \
       make install
     elif [ "$TEST_ANDROID" = "yes" ]; then
       export AUTOTOOLS_BUILD="$(./config.guess)"
@@ -359,20 +359,20 @@ script:
         --build="$AUTOTOOLS_BUILD" --host="$AUTOTOOLS_HOST" \
         --prefix="$ANDROID_PREFIX" \
         --with-ssl="$ANDROID_PREFIX" --disable-gost \
-        --with-libexpat="$ANDROID_PREFIX";
-      make -j 2
+        --with-libexpat="$ANDROID_PREFIX"; && \
+      make -j 2 && \
       make install
     elif [ "$TEST_OSX" = "yes" ]; then
-      ./configure --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl
-      make -j 2
-      make test
+      ./configure --enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl && \
+      make -j 2 && \
+      make test && \
       if [ "$TEST_ANALYZER" = "yes" ]; then
         (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
       fi
     else
-      ./configure ${CONFIG_OPTS}
-      make -j 2
-      make test
+      ./configure ${CONFIG_OPTS} && \
+      make -j 2 && \
+      make test && \
       if [ "$TEST_ANALYZER" = "yes" ]; then
         (cd testdata/clang-analysis.tdir; bash clang-analysis.test)
       fi
-- 
2.47.2