From 055f272517306e6877a126e414aa60191b483eba Mon Sep 17 00:00:00 2001
From: Nikolaus Rath <Nikolaus@rath.org>
Date: Sun, 5 May 2019 13:11:03 -0400
Subject: Added new example filesystem

passthrough_hp puts emphasis and performance and correctness, rather
than simplicity.
---
 test/travis-build.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'test/travis-build.sh')

diff --git a/test/travis-build.sh b/test/travis-build.sh
index dc46120..b2f3610 100755
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -27,12 +27,15 @@ cd "${TEST_DIR}"
 # Standard build
 for CC in gcc gcc-7 clang; do
     mkdir build-${CC}; cd build-${CC}
+    if [ "${CC}" == "clang" ]; then
+        export CXX="clang++"
+    fi
     if [ ${CC} == 'gcc-7' ]; then
         build_opts='-D b_lundef=false'
     else
         build_opts=''
     fi
-    meson -D werror=true ${build_opts} "${SOURCE_DIR}"
+    meson -D werror=true ${build_opts} "${SOURCE_DIR}" || (cat meson-logs/meson-log.txt; false)
     ninja
 
     sudo chown root:root util/fusermount3
@@ -44,11 +47,13 @@ done
 
 # Sanitized build
 CC=clang
+CXX=clang++
 for san in undefined address; do
     mkdir build-${san}; cd build-${san}
     # b_lundef=false is required to work around clang
     # bug, cf. https://groups.google.com/forum/#!topic/mesonbuild/tgEdAXIIdC4
-    meson -D b_sanitize=${san} -D b_lundef=false -D werror=true "${SOURCE_DIR}"
+    meson -D b_sanitize=${san} -D b_lundef=false -D werror=true "${SOURCE_DIR}" \
+           || (cat meson-logs/meson-log.txt; false)
     ninja
 
     # Test as root and regular user
-- 
cgit v1.2.3