Title: [137770] trunk/Tools
- Revision
- 137770
- Author
- rn...@webkit.org
- Date
- 2012-12-14 14:13:54 -0800 (Fri, 14 Dec 2012)
Log Message
"Running 1 DumpRenderTree over X shards" is not a helpful output
https://bugs.webkit.org/show_bug.cgi?id=104858
Reviewed by Dirk Pranke.
The word "shard" is not typically used in test frameworks. This word is confusing for many WebKit
contributors who typically don't have much experience on distributed computations and databases.
So only print this message out in the debug mode.
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
* Scripts/webkitpy/layout_tests/views/printing.py:
(Printer.print_workers_and_shards):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (137769 => 137770)
--- trunk/Tools/ChangeLog 2012-12-14 22:11:18 UTC (rev 137769)
+++ trunk/Tools/ChangeLog 2012-12-14 22:13:54 UTC (rev 137770)
@@ -1,3 +1,18 @@
+2012-12-14 Ryosuke Niwa <rn...@webkit.org>
+
+ "Running 1 DumpRenderTree over X shards" is not a helpful output
+ https://bugs.webkit.org/show_bug.cgi?id=104858
+
+ Reviewed by Dirk Pranke.
+
+ The word "shard" is not typically used in test frameworks. This word is confusing for many WebKit
+ contributors who typically don't have much experience on distributed computations and databases.
+ So only print this message out in the debug mode.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ (Printer.print_workers_and_shards):
+
2012-12-13 Eric Seidel <e...@webkit.org>
Add --profiler=PROFILER option to run-perf-tests to allow specifying which profiler to use on platforms with many
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (137769 => 137770)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-12-14 22:11:18 UTC (rev 137769)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-12-14 22:13:54 UTC (rev 137770)
@@ -317,7 +317,7 @@
del os.environ["WEBKIT_TEST_MAX_LOCKED_SHARDS"]
_, regular_output, _ = logging_run(['--debug-rwt-logging', '--child-processes', '2'], shared_port=False)
try:
- self.assertTrue(any(['(1 locked)' in line for line in regular_output.buflist]))
+ self.assertTrue(any(['1 locked' in line for line in regular_output.buflist]))
finally:
if save_env_webkit_test_max_locked_shards:
os.environ["WEBKIT_TEST_MAX_LOCKED_SHARDS"] = save_env_webkit_test_max_locked_shards
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (137769 => 137770)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2012-12-14 22:11:18 UTC (rev 137769)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2012-12-14 22:13:54 UTC (rev 137770)
@@ -114,10 +114,11 @@
def print_workers_and_shards(self, num_workers, num_shards, num_locked_shards):
driver_name = self._port.driver_name()
if num_workers == 1:
- self._print_default("Running 1 %s over %s." % (driver_name, grammar.pluralize('shard', num_shards)))
+ self._print_default("Running 1 %s." % driver_name)
+ self._print_debug("(%s)." % grammar.pluralize('shard', num_shards))
else:
- self._print_default("Running %d %ss in parallel over %d shards (%d locked)." %
- (num_workers, driver_name, num_shards, num_locked_shards))
+ self._print_default("Running %d %ss in parallel." % (num_workers, driver_name))
+ self._print_debug("(%d shards; %d locked)." % (num_shards, num_locked_shards))
self._print_default('')
def _print_expected_results_of_type(self, run_results, result_type, result_type_str, tests_with_result_type_callback):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
