Title: [91432] trunk/Tools
- Revision
- 91432
- Author
- [email protected]
- Date
- 2011-07-20 17:50:23 -0700 (Wed, 20 Jul 2011)
Log Message
new-run-webkit-tests --leaks does not restart DumpRenderTree often enough
https://bugs.webkit.org/show_bug.cgi?id=64912
Reviewed by Adam Barth.
The bug was that set_default_option only works if the option's value
is "None". So I fixed --batch-size to default to None instead of 0
(which kinda makes sense).
* Scripts/webkitpy/layout_tests/controllers/worker.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91431 => 91432)
--- trunk/Tools/ChangeLog 2011-07-21 00:47:52 UTC (rev 91431)
+++ trunk/Tools/ChangeLog 2011-07-21 00:50:23 UTC (rev 91432)
@@ -1,5 +1,19 @@
2011-07-20 Eric Seidel <[email protected]>
+ new-run-webkit-tests --leaks does not restart DumpRenderTree often enough
+ https://bugs.webkit.org/show_bug.cgi?id=64912
+
+ Reviewed by Adam Barth.
+
+ The bug was that set_default_option only works if the option's value
+ is "None". So I fixed --batch-size to default to None instead of 0
+ (which kinda makes sense).
+
+ * Scripts/webkitpy/layout_tests/controllers/worker.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
+2011-07-20 Eric Seidel <[email protected]>
+
Make kill-old-processes kill httpd on mac
https://bugs.webkit.org/show_bug.cgi?id=64898
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py (91431 => 91432)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py 2011-07-21 00:47:52 UTC (rev 91431)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/worker.py 2011-07-21 00:50:23 UTC (rev 91432)
@@ -48,8 +48,8 @@
self._done = False
self._canceled = False
self._port = None
- self._batch_size = 0
- self._batch_count = 0
+ self._batch_size = None
+ self._batch_count = None
self._filesystem = None
self._driver = None
self._tests_run_file = None
@@ -67,7 +67,7 @@
self._port = port
self._filesystem = port.filesystem
self._batch_count = 0
- self._batch_size = self._options.batch_size
+ self._batch_size = self._options.batch_size or 0
tests_run_filename = self._filesystem.join(port.results_directory(), "tests_run%d.txt" % self._worker_number)
self._tests_run_file = self._filesystem.open_text_file_for_writing(tests_run_filename)
@@ -155,6 +155,7 @@
def kill_driver(self):
if self._driver:
+ _log.debug("%s killing driver" % self._name)
self._driver.stop()
self._driver = None
@@ -185,7 +186,6 @@
_log.debug("%s %s passed" % (self._name, test_name))
if self._batch_size > 0 and self._batch_count >= self._batch_size:
- # Bounce the shell and reset count.
self.kill_driver()
self._batch_count = 0
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (91431 => 91432)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-07-21 00:47:52 UTC (rev 91431)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2011-07-21 00:50:23 UTC (rev 91432)
@@ -365,7 +365,7 @@
# Restart DumpRenderTree every n tests (default: 1000)
optparse.make_option("--batch-size",
help=("Run a the tests in batches (n), after every n tests, "
- "DumpRenderTree is relaunched."), type="int", default=0),
+ "DumpRenderTree is relaunched."), type="int", default=None),
# old-run-webkit-tests calls --run-singly: -1|--singly
# Isolate each test case run (implies --nthly 1 --verbose)
optparse.make_option("--run-singly", action=""
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
