Fix proposed by Mitz Pettel, reviewed by Darin.

        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=7718
          run-webkit-tests fast/dom/HTMLObjectElement/ hangs

        * Scripts/run-webkit-tests: Make test paths canonical, to form proper URLs
        (sequences of slashes are equivalent to a single slash in POSIX paths, but not
        in URLs).

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13267 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e70e95b285be954467743c2706f62b1453bd270c..6024d3daa96827583d7d131f0c2804c14c7254f9 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2006-03-13  Alexey Proskuryakov  <ap@nypop.com>
+
+        Fix proposed by Mitz Pettel, reviewed by Darin.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=7718
+          run-webkit-tests fast/dom/HTMLObjectElement/ hangs
+
+        * Scripts/run-webkit-tests: Make test paths canonical, to form proper URLs
+        (sequences of slashes are equivalent to a single slash in POSIX paths, but not 
+        in URLs).
+
 2006-03-09  Darin Adler  <darin@apple.com>
 
         Reviewed by John Sullivan.

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 5df06e3c4f1376ae268667cb693adc2b6d9a569d..c0ec5654e9eb9b3abc236e7468e00a0ff09d6131 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -309,11 +309,11 @@ for my $test (@tests) {
             $testPath =~ s|/cygdrive/c|c:|;
             $testPath =~ s|/|\\|g;
         } 
-        print OUT "$testPath\n";
+        print OUT File::Spec->canonpath("$testPath") . "\n";
     } else {
         openHTTPDIfNeeded();
         
-        my $path = $test;
+        my $path = File::Spec->canonpath($test);
         $path =~ s/^http\/tests\///;
         print OUT "http://127.0.0.1:$httpdPort/$path\n";
     }