aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2007-11-17 17:43:33 +0000
committerYang Tse <yangsita@gmail.com>2007-11-17 17:43:33 +0000
commitc4e5613a7d431ca547d9e5d63dbafe51e66c1613 (patch)
treea4bcd183570ef9b3fae7deabf31243eb39aa9b41
parentbff962398d0f572b4ea689053e020080565944d5 (diff)
When unable to start test suite sshserver, log if OpenSSH has not been
found or the OpenSSH version found
-rw-r--r--tests/sshserver.pl9
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index 3a30fbe5e..d5b49afe4 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;
}