Title: [89971] trunk/Tools
- Revision
- 89971
- Author
- [email protected]
- Date
- 2011-06-28 16:06:20 -0700 (Tue, 28 Jun 2011)
Log Message
2011-06-28 Eric Seidel <[email protected]>
Reviewed by Adam Barth.
Make new-run-webkit-tests -2 actually use WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=63572
new-run-webkit-tests -2 works with this change. However a zillion
tests fail since it can't find the right skipped lists for wk2.
The Skipped-list fixing is covered in bug 63501.
* Scripts/webkitpy/layout_tests/port/gtk.py:
* Scripts/webkitpy/layout_tests/port/qt.py:
* Scripts/webkitpy/layout_tests/port/webkit.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89970 => 89971)
--- trunk/Tools/ChangeLog 2011-06-28 22:41:36 UTC (rev 89970)
+++ trunk/Tools/ChangeLog 2011-06-28 23:06:20 UTC (rev 89971)
@@ -1,3 +1,18 @@
+2011-06-28 Eric Seidel <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ Make new-run-webkit-tests -2 actually use WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=63572
+
+ new-run-webkit-tests -2 works with this change. However a zillion
+ tests fail since it can't find the right skipped lists for wk2.
+ The Skipped-list fixing is covered in bug 63501.
+
+ * Scripts/webkitpy/layout_tests/port/gtk.py:
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+
2011-06-28 Ryosuke Niwa <[email protected]>
Reviewed by Adam Roben.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (89970 => 89971)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-06-28 22:41:36 UTC (rev 89970)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-06-28 23:06:20 UTC (rev 89971)
@@ -48,7 +48,7 @@
'apache2-debian-httpd.conf')
def _path_to_driver(self):
- return self._build_path('Programs', 'DumpRenderTree')
+ return self._build_path('Programs', self.driver_name())
def check_build(self, needs_http):
if not self._check_driver():
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (89970 => 89971)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-06-28 22:41:36 UTC (rev 89970)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-06-28 23:06:20 UTC (rev 89971)
@@ -66,7 +66,7 @@
return True
def _path_to_driver(self):
- return self._build_path('bin/DumpRenderTree')
+ return self._build_path('bin/%s' % self.driver_name())
def _path_to_image_diff(self):
return self._build_path('bin/ImageDiff')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (89970 => 89971)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-06-28 22:41:36 UTC (rev 89970)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-06-28 23:06:20 UTC (rev 89971)
@@ -329,7 +329,7 @@
self.get_option('configuration')), *comps)
def _path_to_driver(self):
- return self._build_path('DumpRenderTree')
+ return self._build_path(self.driver_name())
def _path_to_webcore_library(self):
return None
@@ -360,12 +360,12 @@
class WebKitDriver(base.Driver):
- """WebKit implementation of the DumpRenderTree interface."""
+ """WebKit implementation of the DumpRenderTree/WebKitTestRunner interface."""
def __init__(self, port, worker_number):
self._worker_number = worker_number
self._port = port
- self._driver_tempdir = port._filesystem.mkdtemp(prefix='DumpRenderTree-')
+ self._driver_tempdir = port._filesystem.mkdtemp(prefix='%s-' % self._port.driver_name())
def __del__(self):
self._port._filesystem.rmtree(str(self._driver_tempdir))
@@ -389,9 +389,10 @@
def start(self):
environment = self._port.setup_environ_for_server()
environment['DYLD_FRAMEWORK_PATH'] = self._port._build_path()
+ # FIXME: We're assuming that WebKitTestRunner checks this DumpRenderTree-named environment variable.
environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
self._server_process = server_process.ServerProcess(self._port,
- "DumpRenderTree", self.cmd_line(), environment)
+ self._port.driver_name(), self.cmd_line(), environment)
def poll(self):
return self._server_process.poll()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
