aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-11-27 19:55:25 +0100
committerDaniel Stenberg <daniel@haxx.se>2017-11-30 08:16:32 +0100
commit270494e1a09dd2dc6504150220c492406be62e79 (patch)
tree9691fc221907a2052bb01a2bf8791e69a7df9c2a
parent62c07b5743490ce373910f469abc8cdc759bec2b (diff)
travis: add boringssl build
Uses a separate build without --enable-debug and no valgrind. The debug option causes far too many warnings in boringssl's headers (C++ comments, trailing commas etc). Valgrind triggers some false positive errors in thread-local data used by boringssl. Closes #2118
-rw-r--r--.travis.yml31
1 files changed, 29 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 8db95272f..d3c396c6a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ matrix:
- os: linux
compiler: gcc
dist: trusty
- env: T=normal C=--with-gssapi
+ env: T=normal C="--with-gssapi"
- os: linux
compiler: gcc
dist: trusty
@@ -33,12 +33,16 @@ matrix:
- os: linux
compiler: gcc
dist: trusty
- env: T=normal C=--enable-ares
+ env: T=normal C="--enable-ares"
- os: linux
compiler: gcc
dist: trusty
env: T=normal BROTLI=yes
- os: linux
+ compiler: gcc
+ dist: trusty
+ 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
@@ -108,6 +112,22 @@ before_script:
sudo make install
)
fi
+ if [ "$TRAVIS_OS_NAME" = linux -a "$BORINGSSL" ]; then
+ (cd $HOME &&
+ git clone --depth=1 https://boringssl.googlesource.com/boringssl &&
+ cd boringssl &&
+ mkdir build &&
+ cd build &&
+ cmake -DCMAKE_BUILD_TYPE=release -DBUILD_SHARED_LIBS=1 .. &&
+ make &&
+ cd .. &&
+ mkdir lib &&
+ cd lib &&
+ ln -s ../build/crypto/libcrypto.so . &&
+ ln -s ../build/ssl/libssl.so . &&
+ echo "BoringSSL lib dir: "`pwd` &&
+ export LIBS=-lpthread )
+ fi
script:
- |
@@ -133,6 +153,13 @@ script:
fi
- |
set -eo pipefail
+ if [ "$T" = "novalgrind" ]; then
+ ./configure $C
+ make && make examples
+ make TFLAGS=-n test-nonflaky
+ fi
+ - |
+ set -eo pipefail
if [ "$T" = "normal" ]; then
./configure --enable-warnings --enable-werror $C
make && make examples