Changeset 183443 in webkit

Timestamp:

Apr 27, 2015 6:06:14 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Add 'init.py' and fix known bug in benchmark runner.
​https://bugs.webkit.org/show_bug.cgi?id=144296

Patch by Dewei Zhu <Dewei Zhu> on 2015-04-27
Reviewed by Ryosuke Niwa

• Scripts/webkitpy/benchmark_runner/init.py: Make python to recognize this module.
• Scripts/webkitpy/benchmark_runner/benchmark_builder/init.py: Make python to recognize this module.
• Scripts/webkitpy/benchmark_runner/benchmark_runner.py:

(BenchmarkRunner.init):
(BenchmarkRunner.execute): Fix logic bug that '--output-file' option doesn't work, and empty output file bug.

• Scripts/webkitpy/benchmark_runner/browser_driver/init.py: Make python to recognize this module.
• Scripts/webkitpy/benchmark_runner/http_server_driver/init.py: Make python to recognize this module.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/benchmark_runner/__init__.py (added)
• Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py (added)
• Scripts/webkitpy/benchmark_runner/benchmark_runner.py (modified) (3 diffs)
• Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py (added)
• Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-04-27  Dewei Zhu  <dewei_zhu@apple.com>
+
+        Add '__init__.py' and fix known bug in benchmark runner.
+        https://bugs.webkit.org/show_bug.cgi?id=144296
+
+        Reviewed by Ryosuke Niwa
+
+        * Scripts/webkitpy/benchmark_runner/__init__.py: Make python to recognize this module.
+        * Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py: Make python to recognize this module.
+        * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+        (BenchmarkRunner.__init__):
+        (BenchmarkRunner.execute): Fix logic bug that '--output-file' option doesn't work, and empty output file bug.
+        * Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py: Make python to recognize this module.
+        * Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py: Make python to recognize this module.
+
 2015-04-27  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py

@@ -33 +33 @@
                 self.benchmarks = self.plan['benchmarks']
                 self.buildDir = os.path.abspath(buildDir)
-                self.outputFile = outputFile if outputFile else 'benchmark.result'
+                self.outputFile = outputFile
         except IOError:
             _log.error('Can not open plan file: %s' % planFile)
@@ -57 +57 @@
                         result = json.loads(self.httpServerDriver.fetchResult())
                         assert(result)
+                        results.append(result)
                 except:
                     _log.error('No result. Something went wrong. Will skip current benchmark.')
@@ -65 +66 @@
                     _log.info('End of %d iteration of current benchmark' % (x + 1))
             results = self.wrap(results)
-            self.dump(results, benchmark['output_file'] if benchmark['output_file'] else self.outputFile)
+            self.dump(results, self.outputFile if self.outputFile else benchmark['output_file'])
             benchmarkBuilder.clean()