Loading tests/runtests.pl +3 −3 Original line number Diff line number Diff line Loading @@ -1391,7 +1391,7 @@ sub runsocksserver { if($sshpid <= 0 || !kill(0, $sshpid)) { # it is NOT alive logmsg "RUN: failed to start the SOCKS server\n"; logmsg "RUN: failed to start the $srvrname server\n"; display_sshlog(); display_sshconfig(); display_sshdlog(); Loading @@ -1404,7 +1404,7 @@ sub runsocksserver { # Ugly hack but ssh doesn't support pid files my $pid3 = verifyserver("socks",$ip,$port); if(!$pid3) { logmsg "RUN: SOCKS server failed verification\n"; logmsg "RUN: $srvrname server failed verification\n"; # failed to talk to it properly. Kill the server and return failure stopserver("$sshpid $pid2"); $doesntrun{$pidfile} = 1; Loading @@ -1413,7 +1413,7 @@ sub runsocksserver { $pid2 = $pid3; if($verbose) { logmsg "RUN: SOCKS server is now running PID $pid2\n"; logmsg "RUN: $srvrname server is now running PID $pid2\n"; } return ($pid2, $sshpid); Loading Loading
tests/runtests.pl +3 −3 Original line number Diff line number Diff line Loading @@ -1391,7 +1391,7 @@ sub runsocksserver { if($sshpid <= 0 || !kill(0, $sshpid)) { # it is NOT alive logmsg "RUN: failed to start the SOCKS server\n"; logmsg "RUN: failed to start the $srvrname server\n"; display_sshlog(); display_sshconfig(); display_sshdlog(); Loading @@ -1404,7 +1404,7 @@ sub runsocksserver { # Ugly hack but ssh doesn't support pid files my $pid3 = verifyserver("socks",$ip,$port); if(!$pid3) { logmsg "RUN: SOCKS server failed verification\n"; logmsg "RUN: $srvrname server failed verification\n"; # failed to talk to it properly. Kill the server and return failure stopserver("$sshpid $pid2"); $doesntrun{$pidfile} = 1; Loading @@ -1413,7 +1413,7 @@ sub runsocksserver { $pid2 = $pid3; if($verbose) { logmsg "RUN: SOCKS server is now running PID $pid2\n"; logmsg "RUN: $srvrname server is now running PID $pid2\n"; } return ($pid2, $sshpid); Loading