Changeset 57806 in webkit

Timestamp:

Apr 19, 2010 1:40:46 AM (14 years ago)

Author:

tkent@chromium.org

Message:

2010-04-19 Kent Tamura <​tkent@chromium.org>

Reviewed by Eric Seidel.

[Chromium] new-run-webkit-tests should use WebKitDriver for --use-drt
​https://bugs.webkit.org/show_bug.cgi?id=37793

We need to use WebKitDriver instead of ChromiumDriver for Chromium
DRT because its interface is different from test_shell.

Chromium DRT has no UI. So we can't use it to show test results.

• Scripts/webkitpy/layout_tests/port/chromium.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-19  Kent Tamura  <tkent@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        [Chromium] new-run-webkit-tests should use WebKitDriver for --use-drt
+        https://bugs.webkit.org/show_bug.cgi?id=37793
+
+        We need to use WebKitDriver instead of ChromiumDriver for Chromium
+        DRT because its interface is different from test_shell.
+
+        Chromium DRT has no UI.  So we can't use it to show test results.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2010-04-18  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -37 +37 @@
 import sys
 import time
+import webbrowser
 
 import base
 import http_server
+import webkit
 import websocket_server
 
@@ -151 +153 @@
 
     def show_results_html_file(self, results_filename):
-        subprocess.Popen([self._path_to_driver(),
-                          self.filename_to_uri(results_filename)])
+        uri = self.filename_to_uri(results_filename)
+        if self._options.use_drt:
+            webbrowser.open(uri, new=1)
+        else:
+            subprocess.Popen([self._path_to_driver(), uri])
 
     def start_driver(self, image_path, options):
         """Starts a new Driver and returns a handle to it."""
+        if self._options.use_drt:
+            return webkit.WebKitDriver(self, image_path, options)
         return ChromiumDriver(self, image_path, options)