From ac26be86f397ddd23bf0ad14ca2cb91a38665b53 Mon Sep 17 00:00:00 2001
From: Peter Wu <peter@lekensteyn.nl>
Date: Sat, 9 May 2020 00:18:29 +0200
Subject: travis: Add ngtcp2 and quiche tests for CMake

To avoid an explosion of jobs, extend the existing CMake tests with
ngtcp2 and quiche support. macOS was previously moved to GitHub actions,
so the non-Linux case can be dropped.
---
 .travis.yml              | 11 +++++++++--
 scripts/travis/script.sh |  9 ++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 59f075fc0..a5ce9625f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -299,9 +299,15 @@ matrix:
         - os: linux
           compiler: gcc
           dist: bionic
+          before_install:
+              # Install and use the current stable release of Go (for boringssl)
+              - gimme --list
+              - eval "$(gimme stable)"
+              - gimme --list
           env:
-              - T=cmake
+              - T=cmake BORINGSSL=yes QUICHE=yes C="-DUSE_QUICHE=1 -DOPENSSL_ROOT_DIR=$HOME/boringssl"
               - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
+              - PKG_CONFIG_PATH="$HOME/quiche/target/release"
           addons:
               apt:
                   sources:
@@ -314,8 +320,9 @@ matrix:
           compiler: clang
           dist: bionic
           env:
-              - T=cmake
+              - T=cmake NGTCP2=yes C="-DUSE_NGTCP2=ON"
               - OVERRIDE_CC="CC=clang-7" OVERRIDE_CXX="CXX=clang++-7"
+              - PKG_CONFIG_PATH="$HOME/ngbuild/lib/pkgconfig"
           addons:
               apt:
                   sources:
diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh
index 57625fc6d..2b20a9910 100755
--- a/scripts/travis/script.sh
+++ b/scripts/travis/script.sh
@@ -106,13 +106,8 @@ if [ "$T" = "iconv" ]; then
 fi
 
 if [ "$T" = "cmake" ]; then
-  if [ $TRAVIS_OS_NAME = linux ]; then
-    cmake -H. -Bbuild -DCURL_WERROR=ON
-    cmake --build build
-  else
-    cmake -H. -Bbuild -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON
-    cmake --build build
-  fi
+  cmake -H. -Bbuild -DCURL_WERROR=ON $C
+  cmake --build build
 fi
 
 if [ "$T" = "distcheck" ]; then
-- 
cgit v1.2.3