Skip to content

Commit

Permalink
travis: Add ngtcp2 and quiche tests for CMake
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Lekensteyn committed May 8, 2020
1 parent d5e9b63 commit 80ab645
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
9 changes: 2 additions & 7 deletions scripts/travis/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 80ab645

Please sign in to comment.