From f4cafa4f0d403f69a6371bd5638b636db56d2de4 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 13 Nov 2021 23:08:35 +0100 Subject: [PATCH] runtests: make the SSH library a testable feature libssh2, libssh and wolfssh --- tests/FILEFORMAT.md | 3 +++ tests/runtests.pl | 15 +++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index df61c412fa..1c45d15630 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -387,6 +387,8 @@ Features testable here are: - `Kerberos` - `large_file` - `ld_preload` +- `libssh2` +- `libssh` - `libz` - `manual` - `Mime` @@ -415,6 +417,7 @@ Features testable here are: - `verbose-strings` - `wakeup` - `win32` +- `wolfssh` as well as each protocol that curl supports. A protocol only needs to be specified if it is different from the server (useful when the server diff --git a/tests/runtests.pl b/tests/runtests.pl index 8b3ba67d84..046f8d3566 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -268,6 +268,9 @@ my $has_manual; # set if built with built-in manual my $has_win32; # set if built for Windows my $has_mingw; # set if built with MinGW (as opposed to MinGW-w64) my $has_hyper = 0; # set if built with Hyper +my $has_libssh2; # set if built with libssh2 +my $has_libssh; # set if built with libssh +my $has_wolfssh; # set if built with wolfssh my $has_unicode; # set if libcurl is built with Unicode support # this version is decided by the particular nghttp2 library that is being used @@ -2874,6 +2877,9 @@ sub setupfeatures { $feature{"large_file"} = $has_largefile; $feature{"ld_preload"} = ($has_ldpreload && !$debug_build); $feature{"libz"} = $has_libz; + $feature{"libssh2"} = $has_libssh2; + $feature{"libssh"} = $has_libssh; + $feature{"wolfssh"} = $has_wolfssh; $feature{"manual"} = $has_manual; $feature{"MinGW"} = $has_mingw; $feature{"MultiSSL"} = $has_multissl; @@ -3026,6 +3032,15 @@ sub checksystem { if ($libcurl =~ /Hyper/i) { $has_hyper=1; } + if ($libcurl =~ /libssh2/i) { + $has_libssh2=1; + } + if ($libcurl =~ /libssh\//i) { + $has_libssh=1; + } + if ($libcurl =~ /wolfssh/i) { + $has_wolfssh=1; + } } elsif($_ =~ /^Protocols: (.*)/i) { # these are the protocols compiled in to this libcurl