From a2fe2f04cd7cb666b2c103f898f6147239be3041 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Wed, 26 May 2021 00:16:19 -0700 Subject: [PATCH] travis: add bearssl build Closes #7133 --- .travis.yml | 11 +++++++++++ scripts/travis/before_script.sh | 14 ++++++++++++++ scripts/travis/script.sh | 6 ++++++ 3 files changed, 31 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3fdc761c7a..20863771c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ cache: directories: - $HOME/wolfssl-4.7.0-stable - $HOME/mesalink-1.0.0 + - $HOME/bearssl-0.6 env: global: @@ -134,6 +135,16 @@ jobs: - libpsl-dev - libbrotli-dev - libzstd-dev + - env: + - T=debug-bearssl C="--with-bearssl" BEARSSL="yes" + addons: + apt: + <<: *common_apt + packages: + - *common_packages + - libpsl-dev + - libbrotli-dev + - libzstd-dev - env: - T=novalgrind LIBRESSL=yes C="--with-openssl=$HOME/libressl" LD_LIBRARY_PATH=/home/travis/libressl/lib:/usr/local/lib - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh index 96825f0ab9..1bb76f4bcb 100755 --- a/scripts/travis/before_script.sh +++ b/scripts/travis/before_script.sh @@ -175,4 +175,18 @@ if [ $TRAVIS_OS_NAME = linux ]; then sudo make install fi + + if [ "$BEARSSL" = "yes" ]; then + if [ ! -e $HOME/bearssl-0.6/Makefile ]; then + cd $HOME + curl -LO https://bearssl.org/bearssl-0.6.tar.gz + tar -xzf bearssl-0.6.tar.gz + cd bearssl-0.6 + make + fi + cd $HOME/bearssl-0.6 + sudo cp inc/*.h /usr/local/include + sudo cp build/libbearssl.* /usr/local/lib + fi + fi diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh index a824c1b1e7..f2286850d1 100755 --- a/scripts/travis/script.sh +++ b/scripts/travis/script.sh @@ -76,6 +76,12 @@ if [ "$T" = "debug-rustls" ]; then make "TFLAGS=HTTPS !313" test-nonflaky fi +if [ "$T" = "debug-bearssl" ]; then + ./configure --enable-debug --enable-werror $C + make + make "TFLAGS=-n !313" test-nonflaky +fi + if [ "$T" = "novalgrind" ]; then ./configure --enable-werror $C make