From: Yang Tse <yangsita@gmail.com>
Date: Sat, 17 Nov 2007 17:43:33 +0000 (+0000)
Subject: When unable to start test suite sshserver, log if OpenSSH has not been
X-Git-Tag: curl-7_18_0~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4e5613a7d431ca547d9e5d63dbafe51e66c1613;p=thirdparty%2Fcurl.git

When unable to start test suite sshserver, log if OpenSSH has not been
found or the OpenSSH version found
---

diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index 3a30fbe5eb..d5b49afe4b 100644
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -131,7 +131,14 @@ if ($verbose) {
 
 # Verify minimum OpenSSH version.
 if (($ssh_daemon !~ /OpenSSH/) || (10 * $ssh_ver_major + $ssh_ver_minor < 37)) {
-    print "SCP, SFTP and SOCKS tests require OpenSSH 3.7 or later\n";
+    my $info;
+    if(!$ssh_daemon) {
+        $info = "OpenSSH not found";
+    }
+    else {
+        $info = "Found OpenSSH $ssh_ver_major.$ssh_ver_minor"
+    }
+    print "$info: SCP, SFTP and SOCKS tests require OpenSSH 3.7 or later\n";
     exit 1;
 }