Title: [185339] trunk/Tools
- Revision
- 185339
- Author
- [email protected]
- Date
- 2015-06-08 17:16:01 -0700 (Mon, 08 Jun 2015)
Log Message
Partially revert and fix after r185243.
* Scripts/benchmark_runner/benchmark_runner.py:
* Scripts/run-benchmark:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (185338 => 185339)
--- trunk/Tools/ChangeLog 2015-06-08 23:52:45 UTC (rev 185338)
+++ trunk/Tools/ChangeLog 2015-06-09 00:16:01 UTC (rev 185339)
@@ -1,3 +1,10 @@
+2015-06-08 Ryosuke Niwa <[email protected]>
+
+ Partially revert and fix after r185243.
+
+ * Scripts/benchmark_runner/benchmark_runner.py:
+ * Scripts/run-benchmark:
+
2015-06-08 Daniel Bates <[email protected]>
Many LayoutTests/http tests time out in DumpRenderTree
Modified: trunk/Tools/Scripts/run-benchmark (185338 => 185339)
--- trunk/Tools/Scripts/run-benchmark 2015-06-08 23:52:45 UTC (rev 185338)
+++ trunk/Tools/Scripts/run-benchmark 2015-06-09 00:16:01 UTC (rev 185339)
@@ -36,11 +36,8 @@
_log.debug('\toutput file name\t: %s' % args.output)
_log.debug('\tbuild directory\t: %s' % args.buildDir)
_log.debug('\tplan name\t: %s', args.plan)
- try:
- runner = BenchmarkRunner(args.plan, args.localCopy, args.countOverride, args.buildDir, args.output, args.platform, args.browser)
- runner.execute()
- except Exception as error:
- sys.exit("Error occurred running the benchmark: %s" % error)
+ runner = BenchmarkRunner(args.plan, args.localCopy, args.countOverride, args.buildDir, args.output, args.platform, args.browser)
+ runner.execute()
if __name__ == '__main__':
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (185338 => 185339)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-08 23:52:45 UTC (rev 185338)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-06-09 00:16:01 UTC (rev 185339)
@@ -41,10 +41,10 @@
self.buildDir = os.path.abspath(buildDir) if buildDir else None
self.outputFile = outputFile
except IOError as error:
- _log.error('Can not open plan file: %s - Error %s' % planFile, error)
+ _log.error('Can not open plan file: %s - Error %s' % (planFile, error))
raise error
except ValueError as error:
- _log.error('Plan file: %s may not follow JSON format - Error %s' % planFile, error)
+ _log.error('Plan file: %s may not follow JSON format - Error %s' % (planFile, error))
raise error
def _findPlanFile(self, planFile):
@@ -110,7 +110,7 @@
with open(outputFile, 'w') as fp:
json.dump(results, fp)
except IOError as error:
- _log.error('Cannot open output file: %s - Error: %s' % outputFile, error)
+ _log.error('Cannot open output file: %s - Error: %s' % (outputFile, error))
_log.error('Results are:\n %s', json.dumps(results))
@classmethod
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
