David Byron's fix that makes this script use 'cygpath' instead of 'pwd' if

this runs on windows, to find out the current working directory.

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 4af8665f6..450d49aab 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -452,6 +452,22 @@ sub checkcurl {
 
             $curl =~ s/^(.*)(libcurl.*)/$1/g;
             $libcurl = $2;
+
+           if ($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`);
+           }
         }
         elsif($_ =~ /^Protocols: (.*)/i) {
             # these are the supported protocols, we don't use this knowledge