Put -Werror in mesonconf, not CFLAGS

Putting it in CFLAGS interferes with feature detection.

diff --git a/test/travis-build.sh b/test/travis-build.sh
index f971cbe4cc65050851511580c3ecee10df2c0f43..4d950b5462dbe92527a5f49227e1b47d388cf80d 100755 (executable)
--- a/test/travis-build.sh
+++ b/test/travis-build.sh
@@ -6,7 +6,6 @@ set -e
 # that we still need to fix
 export ASAN_OPTIONS="detect_leaks=0"
 
-export CFLAGS="-Werror"
 export LSAN_OPTIONS="suppressions=$(pwd)/test/lsan_suppress.txt"
 export CC
 
@@ -18,7 +17,7 @@ for CC in gcc gcc-6 clang; do
     else
         build_opts=''
     fi
-    meson ${build_opts} ../
+    meson -D werror=true ${build_opts} ../
     ninja
 
     sudo chown root:root util/fusermount3
@@ -34,7 +33,7 @@ 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 ..
+    meson -D b_sanitize=${san} -D b_lundef=false -D werror=true ..
     ninja
 
     # Test as root and regular user