]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
runtests: make the SSH library a testable feature
authorDaniel Stenberg <daniel@haxx.se>
Sat, 13 Nov 2021 22:08:35 +0000 (23:08 +0100)
committerDaniel Stenberg <daniel@haxx.se>
Sun, 14 Nov 2021 15:13:44 +0000 (16:13 +0100)
libssh2, libssh and wolfssh

tests/FILEFORMAT.md
tests/runtests.pl

index df61c412fa58b817af9d9d47c2b1d1c91217110a..1c45d156301e7875a1ae0346b93f8376b19b02b7 100644 (file)
@@ -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
index 8b3ba67d84dc275e7a075cb33af2b1c87b070fba..046f8d356690bb6e796de937b688900d350aeeee 100755 (executable)
@@ -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