summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-11-30 00:26:08 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-11-30 00:26:08 +0100
commitde69929d943df335b506ef070f06051ab1946174 (patch)
tree9691fc221907a2052bb01a2bf8791e69a7df9c2a
parenta367e34a3324954489a9a28539ee0336bc835f7c (diff)
downloadcurl-bagder/travis-boringssl.tar.gz
fixup: use separate build without --enable-debug and no valgrindbagder/travis-boringssl
The debug option causes far too many warnings in boringssl headers. Valgrind triggers some false positive errors in thread-local data used by boringssl.
-rw-r--r--.travis.yml23
1 files changed, 15 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index fd2683625..d3c396c6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,26 +41,26 @@ matrix:
- os: linux
compiler: gcc
dist: trusty
- env: T=debug BORINGSSL=yes -C="--with-ssl=$HOME/boringssl" LD_LIBRARY_PATH=/home/travis/boringssl/lib
+ env: T=novalgrind BORINGSSL=yes -C="--with-ssl=$HOME/boringssl" LD_LIBRARY_PATH=/home/travis/boringssl/lib
- os: linux
compiler: clang
dist: trusty
- env: T=debug C="--enable-werror"
+ env: T=debug
- os: osx
compiler: gcc
- env: T=debug C="--enable-werror"
+ env: T=debug
- os: osx
compiler: gcc
- env: T=debug C="--enable-ares --enable-werror"
+ env: T=debug C=--enable-ares
- os: osx
compiler: gcc
- env: T=debug C="--with-ssl=/usr/local/opt/openssl --with-libmetalink --enable-werror"
+ env: T=debug C="--with-ssl=/usr/local/opt/openssl --with-libmetalink"
- os: osx
compiler: gcc
- env: T=debug C="--with-ssl=/usr/local/opt/libressl --with-libmetalink --enable-werror"
+ env: T=debug C="--with-ssl=/usr/local/opt/libressl --with-libmetalink"
- os: osx
compiler: clang
- env: T=debug C="--without-ssl --with-darwinssl --with-libmetalink --enable-werror"
+ env: T=debug C="--without-ssl --with-darwinssl --with-libmetalink"
- os: osx
compiler: clang
env: T=normal
@@ -147,7 +147,14 @@ script:
- |
set -eo pipefail
if [ "$T" = "debug" ]; then
- ./configure --enable-debug $C
+ ./configure --enable-debug --enable-werror $C
+ make && make examples
+ make TFLAGS=-n test-nonflaky
+ fi
+ - |
+ set -eo pipefail
+ if [ "$T" = "novalgrind" ]; then
+ ./configure $C
make && make examples
make TFLAGS=-n test-nonflaky
fi