Title: [98288] trunk/Tools
- Revision
- 98288
- Author
- e...@webkit.org
- Date
- 2011-10-24 15:26:06 -0700 (Mon, 24 Oct 2011)
Log Message
Plugin tests are failing after switching WK2 to NRWT
https://bugs.webkit.org/show_bug.cgi?id=70760
Reviewed by Simon Fraser.
Perpetuate this horrible hack.
* Scripts/webkitpy/layout_tests/port/webkit.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (98287 => 98288)
--- trunk/Tools/ChangeLog 2011-10-24 22:19:32 UTC (rev 98287)
+++ trunk/Tools/ChangeLog 2011-10-24 22:26:06 UTC (rev 98288)
@@ -1,5 +1,16 @@
2011-10-24 Eric Seidel <e...@webkit.org>
+ Plugin tests are failing after switching WK2 to NRWT
+ https://bugs.webkit.org/show_bug.cgi?id=70760
+
+ Reviewed by Simon Fraser.
+
+ Perpetuate this horrible hack.
+
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+
+2011-10-24 Eric Seidel <e...@webkit.org>
+
NRWT doesn't support ORWT's --root option, but should
https://bugs.webkit.org/show_bug.cgi?id=70416
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (98287 => 98288)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-10-24 22:19:32 UTC (rev 98287)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-10-24 22:26:06 UTC (rev 98288)
@@ -110,8 +110,15 @@
return self._executive.run_command(run_script_command, cwd=self._config.webkit_base_dir(), decode_output=decode_output)
def _build_driver(self):
+ # FIXME: We build both DumpRenderTree and WebKitTestRunner for
+ # WebKitTestRunner runs because DumpRenderTree still includes
+ # the DumpRenderTreeSupport module and the TestNetscapePlugin.
+ # These two projects should be factored out into their own
+ # projects.
try:
- self._run_script(self._driver_build_script_name())
+ self._run_script("build-dumprendertree")
+ if self.get_option('webkit_test_runner'):
+ self._run_script("build-webkittestrunner")
except ScriptError:
_log.error("Failed to build %s" % self.driver_name())
return False
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (98287 => 98288)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-10-24 22:19:32 UTC (rev 98287)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-10-24 22:26:06 UTC (rev 98288)
@@ -155,12 +155,13 @@
# Make sure when passed --webkit-test-runner web build the right tool.
port._options = MockOptions(webkit_test_runner=True, configuration="Release")
- expected_stderr = "MOCK run_command: ['Tools/Scripts/build-webkittestrunner', '--release'], cwd=/mock-checkout\n"
+ expected_stderr = "MOCK run_command: ['Tools/Scripts/build-dumprendertree', '--release'], cwd=/mock-checkout\nMOCK run_command: ['Tools/Scripts/build-webkittestrunner', '--release'], cwd=/mock-checkout\n"
self.assertTrue(output.assert_outputs(self, port._build_driver, expected_stderr=expected_stderr))
# Make sure that failure to build returns False.
port._executive = MockExecutive(should_log=True, should_throw=True)
- expected_stderr = "MOCK run_command: ['Tools/Scripts/build-webkittestrunner', '--release'], cwd=/mock-checkout\n"
+ # Because WK2 currently has to build both webkittestrunner and DRT, if DRT fails, that's the only one it tries.
+ expected_stderr = "MOCK run_command: ['Tools/Scripts/build-dumprendertree', '--release'], cwd=/mock-checkout\n"
self.assertFalse(output.assert_outputs(self, port._build_driver, expected_stderr=expected_stderr))
def _assert_config_file_for_platform(self, port, platform, config_file):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
