aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGravatar Nikolaus Rath <Nikolaus@rath.org>2017-01-23 12:07:09 -0800
committerGravatar Nikolaus Rath <Nikolaus@rath.org>2017-01-23 12:07:09 -0800
commit578c8e03d4b3b23b257a84507050b48a4236d9a4 (patch)
tree0a446920c09aaa42014b96c25d00fbe7f98c12a8 /test
parent61c419d59a8f62e854e0c6834da64db4c9014401 (diff)
Put -Werror in mesonconf, not CFLAGS
Putting it in CFLAGS interferes with feature detection.
Diffstat (limited to 'test')
-rwxr-xr-xtest/travis-build.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/travis-build.sh b/test/travis-build.sh
index f971cbe..4d950b5 100755
--- 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