aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarlson2k <k2k@narod.ru>2016-03-16 00:14:47 +0300
committerDaniel Stenberg <daniel@haxx.se>2016-04-29 23:42:44 +0200
commit221deef58031b9b4f97cd6909bbbb50ccc8e3dab (patch)
tree8d9a2f7cbf2bc45bbf47f1f52683fdff225f8438
parent315f06f569ba704086d0660d7f6786eb35a5dac2 (diff)
tests: Use 'pathhelp' for current path in runtests.pl
-rwxr-xr-xtests/runtests.pl28
1 files changed, 7 insertions, 21 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 0128e4481..5d13fc832 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -105,6 +105,8 @@ use sshhelp qw(
sshversioninfo
);
+use pathhelp;
+
require "getpart.pm"; # array functions
require "valgrind.pm"; # valgrind report parser
require "ftp.pm";
@@ -2311,27 +2313,11 @@ sub checksystem {
$curl =~ s/^(.*)(libcurl.*)/$1/g;
$libcurl = $2;
- if($curl =~ /mingw(32|64)/) {
- # This is a windows minw32 build, we need to translate the
- # given path to the "actual" windows path. The MSYS shell
- # has a builtin 'pwd -W' command which converts the path.
- $pwd = `sh -c "echo \$(pwd -W)"`;
- chomp($pwd);
- }
- elsif ($curl =~ /win32/) {
- # Native Windows builds don't understand the
- # output of cygwin's pwd. It will be
- # something like /cygdrive/c/<some path>.
- #
- # Use the cygpath utility to convert the
- # working directory to a Windows friendly
- # path. The -m option converts to use drive
- # letter:, but it uses / instead \. Forward
- # slashes (/) are easier for us. We don't
- # have to escape them to get them to curl
- # through a shell.
- chomp($pwd = `cygpath -m $pwd`);
- }
+ if($curl =~ /win32|mingw(32|64)/) {
+ # This is a Windows MinGW build or native build, we need to use
+ # Win32-style path.
+ $pwd = pathhelp::sys_native_current_path();
+ }
if ($libcurl =~ /winssl/i) {
$has_winssl=1;
$ssllib="WinSSL";