Title: [90781] trunk/Tools
- Revision
- 90781
- Author
- [email protected]
- Date
- 2011-07-11 13:23:37 -0700 (Mon, 11 Jul 2011)
Log Message
Fix hang on win32 in a multiprocessing test that shouldn't have been running.
Unreviewed, build fix.
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90780 => 90781)
--- trunk/Tools/ChangeLog 2011-07-11 19:55:25 UTC (rev 90780)
+++ trunk/Tools/ChangeLog 2011-07-11 20:23:37 UTC (rev 90781)
@@ -1,3 +1,11 @@
+2011-07-11 Dirk Pranke <[email protected]>
+
+ Fix hang on win32 in a multiprocessing test that shouldn't have been running.
+
+ Unreviewed, build fix.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+
2011-07-11 Adam Roben <[email protected]>
Don't count leaks as test failures on TestFailures's front page
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (90780 => 90781)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2011-07-11 19:55:25 UTC (rev 90780)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2011-07-11 20:23:37 UTC (rev 90781)
@@ -249,8 +249,9 @@
self.assertRaises(ValueError, logging_run,
['failures/expected/exception.html'], tests_included=True)
- self.assertRaises(run_webkit_tests.WorkerException, logging_run,
- ['--worker-model', 'processes', 'failures/expected/exception.html'], tests_included=True)
+ if SHOULD_TEST_PROCESSES:
+ self.assertRaises(run_webkit_tests.WorkerException, logging_run,
+ ['--worker-model', 'processes', 'failures/expected/exception.html'], tests_included=True)
def test_full_results_html(self):
# FIXME: verify html?
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
