From 270494e1a09dd2dc6504150220c492406be62e79 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 27 Nov 2017 19:55:25 +0100
Subject: [PATCH] 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
---
 .travis.yml | 31 +++++++++++++++++++++++++++++--
 1 file 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,11 +33,15 @@ 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
@@ -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:
     - |
@@ -131,6 +151,13 @@ script:
              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
     - |
         set -eo pipefail
         if [ "$T" = "normal" ]; then