diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-04-15 09:21:40 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-04-22 23:19:47 +0200 |
| commit | e052bbcd57594be7c8ab4a0119fc8f19efc4df1b (patch) | |
| tree | 5d7b6125c09923c4f05383ac10d63cde67f00407 /scripts | |
| parent | ee36e86ce8f77a017c49b8312814c33f4b969565 (diff) | |
| download | curl-e052bbcd57594be7c8ab4a0119fc8f19efc4df1b.tar.gz | |
ci: adapt to configure requiring an explicit TLS choice
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis/script.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh index 0cb5df1fd..a824c1b1e 100755 --- a/scripts/travis/script.sh +++ b/scripts/travis/script.sh @@ -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 |