moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 17:31:46 -05:00
Code Issues Releases Wiki Activity

tests: Use 'pathhelp' for paths conversions in sshserver.pl

Browse Source
This commit is contained in:
Karlson2k 2016-02-21 23:17:57 +03:00 committed by Daniel Stenberg
parent 221deef580
commit 4c5d5e5e55
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/sshserver.pl
View File

@ -74,6 +74,7 @@ use serverhelp qw(
server_logfilename server_logfilename
); );
use pathhelp;
#*************************************************************************** #***************************************************************************
@ -384,7 +385,7 @@ if((! -e $hstprvkeyf) || (! -s $hstprvkeyf) ||
#*************************************************************************** #***************************************************************************
# Convert paths for curl's tests running on Windows using Cygwin OpenSSH # Convert paths for curl's tests running on Windows with Cygwin/Msys OpenSSH
# #
my $clipubkeyf_config = abs_path("$path/$clipubkeyf"); my $clipubkeyf_config = abs_path("$path/$clipubkeyf");
my $hstprvkeyf_config = abs_path("$path/$hstprvkeyf"); my $hstprvkeyf_config = abs_path("$path/$hstprvkeyf");
@ -392,10 +393,10 @@ my $pidfile_config = $pidfile;
my $sftpsrv_config = $sftpsrv; my $sftpsrv_config = $sftpsrv;
if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') { if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') {
# convert MinGW drive paths to Cygwin drive paths # Ensure to use MinGW/Cygwin paths
$clipubkeyf_config =~ s/^\/(\w)\//\/cygdrive\/$1\//; $clipubkeyf_config = pathhelp::build_sys_abs_path($clipubkeyf_config);
$hstprvkeyf_config =~ s/^\/(\w)\//\/cygdrive\/$1\//; $hstprvkeyf_config = pathhelp::build_sys_abs_path($hstprvkeyf_config);
$pidfile_config =~ s/^\/(\w)\//\/cygdrive\/$1\//; $pidfile_config = pathhelp::build_sys_abs_path($pidfile_config);
$sftpsrv_config = "internal-sftp"; $sftpsrv_config = "internal-sftp";
} }
@ -763,9 +764,9 @@ my $identity_config = abs_path("$path/$identity");
my $knownhosts_config = abs_path("$path/$knownhosts"); my $knownhosts_config = abs_path("$path/$knownhosts");
if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') { if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') {
# convert MinGW drive paths to Cygwin drive paths # Ensure to use MinGW/Cygwin paths
$identity_config =~ s/^\/(\w)\//\/cygdrive\/$1\//; $identity_config = pathhelp::build_sys_abs_path($identity_config);
$knownhosts_config =~ s/^\/(\w)\//\/cygdrive\/$1\//; $knownhosts_config = pathhelp::build_sys_abs_path($knownhosts_config);
} }