aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarlson2k <k2k@narod.ru>2016-02-21 23:17:57 +0300
committerDaniel Stenberg <daniel@haxx.se>2016-04-29 23:42:55 +0200
commit4c5d5e5e55971ce0364218e88a27a5c6f686d163 (patch)
tree487f5af287fc9a4666985582e45128b5b9b8c694
parent221deef58031b9b4f97cd6909bbbb50ccc8e3dab (diff)
tests: Use 'pathhelp' for paths conversions in sshserver.pl
-rwxr-xr-xtests/sshserver.pl17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/sshserver.pl b/tests/sshserver.pl
index b305711b3..3ebf8e675 100755
--- a/tests/sshserver.pl
+++ b/tests/sshserver.pl
@@ -74,6 +74,7 @@ use serverhelp qw(
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 $hstprvkeyf_config = abs_path("$path/$hstprvkeyf");
@@ -392,10 +393,10 @@ my $pidfile_config = $pidfile;
my $sftpsrv_config = $sftpsrv;
if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') {
- # convert MinGW drive paths to Cygwin drive paths
- $clipubkeyf_config =~ s/^\/(\w)\//\/cygdrive\/$1\//;
- $hstprvkeyf_config =~ s/^\/(\w)\//\/cygdrive\/$1\//;
- $pidfile_config =~ s/^\/(\w)\//\/cygdrive\/$1\//;
+ # Ensure to use MinGW/Cygwin paths
+ $clipubkeyf_config = pathhelp::build_sys_abs_path($clipubkeyf_config);
+ $hstprvkeyf_config = pathhelp::build_sys_abs_path($hstprvkeyf_config);
+ $pidfile_config = pathhelp::build_sys_abs_path($pidfile_config);
$sftpsrv_config = "internal-sftp";
}
@@ -763,9 +764,9 @@ my $identity_config = abs_path("$path/$identity");
my $knownhosts_config = abs_path("$path/$knownhosts");
if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'msys') {
- # convert MinGW drive paths to Cygwin drive paths
- $identity_config =~ s/^\/(\w)\//\/cygdrive\/$1\//;
- $knownhosts_config =~ s/^\/(\w)\//\/cygdrive\/$1\//;
+ # Ensure to use MinGW/Cygwin paths
+ $identity_config = pathhelp::build_sys_abs_path($identity_config);
+ $knownhosts_config = pathhelp::build_sys_abs_path($knownhosts_config);
}