2010-05-10 Dirk Pranke <dpranke@chromium.org>

        Reviewed by Eric Seidel.

        new-run-webkit-tests: fix a path-handling bug that was breaking the
        dryrun ports on windows, and add a comment about why we don't run
        the chromium dryrun tests by default on every port.

        https://bugs.webkit.org/show_bug.cgi?id=38796

        * Scripts/webkitpy/layout_tests/port/dryrun.py:
        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 938f1fb451b45f21026bbda4a28f0724d9f4ade6..07eed2eb8b587a57de69f4761f4aa0bfe4c00fc1 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-05-10  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        new-run-webkit-tests: fix a path-handling bug that was breaking the
+        dryrun ports on windows, and add a comment about why we don't run
+        the chromium dryrun tests by default on every port.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38796
+
+        * Scripts/webkitpy/layout_tests/port/dryrun.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2010-05-11  Mark Rowe  <mrowe@apple.com>
 
         Reviewed by Darin Adler.

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/dryrun.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/dryrun.py
index 2cbb1b96172fadfaf38e36e64d428f27001f0fbc..2c9286554b7f4efba86560d3a43c62e0a8e14890 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/dryrun.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/dryrun.py
@@ -46,6 +46,8 @@
 
 from __future__ import with_statement
 
+import sys
+
 import base
 import factory
 
@@ -172,7 +174,11 @@ class DryrunDriver(base.Driver):
         test = uri
 
         if uri.startswith("file:///"):
-            test = test.replace('file://', '')
+            if sys.platform == 'win32':
+                test = test.replace('file:///', '')
+                test = test.replace('/', '\\')
+            else:
+                test = test.replace('file://', '')
             return test
         elif uri.startswith("http://127.0.0.1:8880/"):
             # websocket tests

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
index 5089a2e1efa09de723fc07bedb9d232f2497b140..e050cba7bb163b1527a837976a110a20c33dbb17 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
@@ -118,21 +118,17 @@ class TestRunnerTest(unittest.TestCase):
 
 class DryrunTest(unittest.TestCase):
     def test_basics(self):
-        # FIXME: This test depends on being able to detect the correct
-        # port from the environment.  Thus it can't work for Gtk/Qt without
-        # modification or more information being passed into test-webkitpy.
-        if sys.platform not in "mac":
+        # FIXME: it's hard to know which platforms are safe to test; the
+        # chromium platforms require a chromium checkout, and the mac platform
+        # requires fcntl, so it can't be tested on win32, etc. There is
+        # probably a better way of handling this.
+        if sys.platform != "mac":
             return
         self.assertTrue(passing_run(['--platform', 'dryrun',
                                      'fast/html']))
-        #self.assertTrue(passing_run(['--platform', 'dryrun-mac',
-        #                             'fast/html']))
-        #self.assertTrue(passing_run(['--platform', 'dryrun-chromium-mac',
-        #                             'fast/html']))
-        #self.assertTrue(passing_run(['--platform', 'dryrun-chromium-win',
-        #                             'fast/html']))
-        #self.assertTrue(passing_run(['--platform', 'dryrun-chromium-linux',
-        #                             'fast/html']))
+        self.assertTrue(passing_run(['--platform', 'dryrun-mac',
+                                     'fast/html']))
+
 
 if __name__ == '__main__':
     unittest.main()