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.
This commit is contained in:
Peter Wu 2020-05-09 00:18:29 +02:00 committed by Daniel Stenberg
parent 5d8c53d320
commit ac26be86f3
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 11 additions and 9 deletions

View File

@ -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:

View File

@ -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