ci: adapt to configure requiring an explicit TLS choice

This commit is contained in:
Daniel Stenberg 2021-04-15 09:21:40 +02:00
parent ee36e86ce8
commit e052bbcd57
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
7 changed files with 85 additions and 80 deletions

View file

@ -36,14 +36,14 @@ if [ "$T" = "coverage" ]; then
fi
if [ "$T" = "torture" ]; then
./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2
./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2 --with-openssl
make
tests="!TLS-SRP !FTP"
make "TFLAGS=-n --shallow=20 -t $tests" test-nonflaky
fi
if [ "$T" = "events" ]; then
./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2
./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2 --with-openssl
make
tests="!TLS-SRP"
make "TFLAGS=-n -e $tests" test-nonflaky
@ -123,13 +123,13 @@ fi
if [ "$T" = "distcheck" ]; then
# find BOM markers and exit if we do
! git grep `printf '\xef\xbb\xbf'`
./configure
./configure --without-ssl
make
./maketgz 99.98.97
# verify in-tree build - and install it
tar xf curl-99.98.97.tar.gz
cd curl-99.98.97
./configure --prefix=$HOME/temp
./configure --prefix=$HOME/temp --without-ssl
make
make TFLAGS=1 test
make install
@ -142,7 +142,7 @@ if [ "$T" = "distcheck" ]; then
touch curl-99.98.97/docs/{cmdline-opts,libcurl}/Makefile.inc
mkdir build
cd build
../curl-99.98.97/configure
../curl-99.98.97/configure --without-ssl
make
make TFLAGS='-p 1 1139' test
# verify cmake build