diff options
| author | Marc Hoersken <info@marc-hoersken.de> | 2014-12-21 02:42:29 +0100 |
|---|---|---|
| committer | Marc Hoersken <info@marc-hoersken.de> | 2014-12-21 03:52:36 +0100 |
| commit | 011488945600f6ddc53d2a8d2c6c3c1122e8d7fb (patch) | |
| tree | 75462eaaceecc25915454ff1bddf68040d7d9a7c /tests/runtests.pl | |
| parent | 2c7f099253a582545d06fc6b3a4ff017d09c30a9 (diff) | |
tests: support spaces in paths to SSH, SSHD and SFTP binaries
First patch to enable Windows support using Cygwin-based OpenSSH.
Diffstat (limited to 'tests/runtests.pl')
| -rwxr-xr-x | tests/runtests.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index 8b2ec5a2b..6b1a502d7 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -984,7 +984,7 @@ sub verifysftp { } # Connect to sftp server, authenticate and run a remote pwd # command using our generated configuration and key files - my $cmd = "$sftp -b $sftpcmds -F $sftpconfig -S $ssh $ip > $sftplog 2>&1"; + my $cmd = "\"$sftp\" -b $sftpcmds -F $sftpconfig -S \"$ssh\" $ip > $sftplog 2>&1"; my $res = runclient($cmd); # Search for pwd command response in log file if(open(SFTPLOGFILE, "<$sftplog")) { @@ -2066,7 +2066,7 @@ sub runsocksserver { $sshlog = server_logfilename($LOGDIR, 'socks', $ipvnum, $idnum); # start our socks server - my $cmd="$ssh -N -F $sshconfig $ip > $sshlog 2>&1"; + my $cmd="\"$ssh\" -N -F $sshconfig $ip > $sshlog 2>&1"; my ($sshpid, $pid2) = startnew($cmd, $pidfile, 30, 1); # fake pidfile if($sshpid <= 0 || !pidexists($sshpid)) { |