Changeset 57524 in webkit

Timestamp:

Apr 13, 2010 11:00:07 AM (14 years ago)

Author:

Adam Roben

Message:

Fix run-webkit-tests on Windows with spaces in the path

Fixes <​http://webkit.org/b/37509>.

Reviewed by Steve Falkenburg.

• Scripts/run-webkit-tests:

(convertPathUsingCygpath): Remove spaces from the path before passing
them to cygpath, then add them back in after conversion, as some
versions of cygpath seem to convert spaces into newlines.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-13  Adam Roben  <aroben@apple.com>
+
+        Fix run-webkit-tests on Windows with spaces in the path
+
+        Fixes <http://webkit.org/b/37509>.
+
+        Reviewed by Steve Falkenburg.
+
+        * Scripts/run-webkit-tests:
+        (convertPathUsingCygpath): Remove spaces from the path before passing
+        them to cygpath, then add them back in after conversion, as some
+        versions of cygpath seem to convert spaces into newlines.
+
 2010-04-13  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -1669 +1669 @@
     my ($path, $options) = @_;
 
+    # cygpath -f (at least in Cygwin 1.7) converts spaces into newlines. We remove spaces here and
+    # add them back in after conversion to work around this.
+    my $spaceSubstitute = "__NOTASPACE__";
+    $path =~ s/ /\Q$spaceSubstitute\E/g;
+
     my $cygpath = openCygpathIfNeeded($options);
     local *inFH = $cygpath->{"in"};
@@ -1675 +1680 @@
     my $convertedPath = <inFH>;
     chomp($convertedPath) if defined $convertedPath;
+
+    $convertedPath =~ s/\Q$spaceSubstitute\E/ /g;
     return $convertedPath;
 }