Attachment 349068 Details for Bug 189367 – ROLLOUT of r235755

[patch] ROLLOUT of r235755

bug-189367-20180906170722.patch (text/plain), 3.93 KB, created by WebKit Commit Bot on 2018-09-06 14:07:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-09-06 14:07:23 PDT

Size: 3.93 KB

patch

obsolete

>Subversion Revision: 235755
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index d6a73186a63946b2d0feb62ebe152fd4fd16b7b1..9fd756b43fdc2221d13692fc871c6887e4bc61e6 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-09-06  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r235755.
>+        https://bugs.webkit.org/show_bug.cgi?id=189367
>+
>+        Didn't address the review comment (Requested by rniwa on
>+        #webkit).
>+
>+        Reverted changeset:
>+
>+        "BenchmarkResults.format should support specifying depth of
>+        tests to show."
>+        https://bugs.webkit.org/show_bug.cgi?id=189135
>+        https://trac.webkit.org/changeset/235755
>+
> 2018-08-29  Dewei Zhu  <dewei_zhu@apple.com>
> 
>         BenchmarkResults.format should support specifying depth of tests to show.
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py b/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py
>index 3d718de4e89db0569de4e2e0fdab3d3de19a1a79..d02dc1a16679810046ecdfa836faa25a218f4ff7 100644
>--- a/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py
>@@ -48,13 +48,11 @@ class BenchmarkResults(object):
>         self._lint_results(results)
>         self._results = self._aggregate_results(results)
> 
>-    def format(self, scale_unit=True, show_iteration_values=False, max_depth=None):
>-        return self._format_tests(self._results, scale_unit, show_iteration_values, max_depth)
>+    def format(self, scale_unit=True, show_iteration_values=False):
>+        return self._format_tests(self._results, scale_unit, show_iteration_values)
> 
>     @classmethod
>-    def _format_tests(cls, tests, scale_unit, show_iteration_values, max_depth, indent=''):
>-        if max_depth is not None and max_depth <= 0:
>-            return ''
>+    def _format_tests(cls, tests, scale_unit, show_iteration_values, indent=''):
>         output = ''
>         config_name = 'current'
>         for test_name in sorted(tests.keys()):
>@@ -75,7 +73,7 @@ class BenchmarkResults(object):
>                         output += aggregator_name + ':'
>                     output += ' ' + cls._format_values(metric_name, metric[aggregator_name][config_name], scale_unit, show_iteration_values) + '\n'
>             if 'tests' in test:
>-                output += cls._format_tests(test['tests'], scale_unit, show_iteration_values, max_depth - 1 if max_depth else None, indent=(indent + ' ' * len(test_name)))
>+                output += cls._format_tests(test['tests'], scale_unit, show_iteration_values, indent=(indent + ' ' * len(test_name)))
>         return output
> 
>     @classmethod
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py b/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py
>index f3db4b3fd0abbfde8335596832f1d3c538a8c506..d4be43c82e373657565c10ca007c3ef23eb11e2e 100644
>--- a/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py
>@@ -55,18 +55,6 @@ SomeTest:Time:Arithmetic: 3.0ms stdev=33.3%
>         SubTest2:Time: 5.0ms stdev=20.0%
> '''[1:])
> 
>-    def test_format_with_depth_limit(self):
>-        result = BenchmarkResults({'SomeTest': {
>-            'metrics': {'Time': ['Total', 'Arithmetic']},
>-            'tests': {
>-                'SubTest1': {'metrics': {'Time': {'current': [1, 2, 3]}}},
>-                'SubTest2': {'metrics': {'Time': {'current': [4, 5, 6]}}}}}})
>-        self.assertEqual(result.format(max_depth=1), '''
>-SomeTest:Time:Arithmetic: 3.0ms stdev=33.3%
>-        :Time:Total: 7.0ms stdev=28.6%
>-'''[1:])
>-        self.assertEqual(result.format(max_depth=0), "")
>-
>     def test_format_values_with_large_error(self):
>         self.assertEqual(BenchmarkResults._format_values('Runs', [1, 2, 3]), '2.0/s stdev=50.0%')
>         self.assertEqual(BenchmarkResults._format_values('Runs', [10, 20, 30]), '20/s stdev=50.0%')

Actions: View | Formatted Diff | Diff

Attachments on bug 189367: 349068