<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183443] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183443">183443</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-27 18:06:14 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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@apple.com> 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runner__init__py">trunk/Tools/Scripts/webkitpy/benchmark_runner/__init__.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_builder__init__py">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driver__init__py">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driver__init__py">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183442 => 183443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-28 00:59:13 UTC (rev 183442)
+++ trunk/Tools/ChangeLog 2015-04-28 01:06:14 UTC (rev 183443)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-04-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> More build fix.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runner__init__py"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/__init__.py (0 => 183443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/__init__.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/__init__.py 2015-04-28 01:06:14 UTC (rev 183443)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+# Required for Python to search this directory for module files
+
+# Keep this file free of any code or import statements that could
+# cause either an error to occur or a log message to be logged.
+# This ensures that calling code can import initialization code from
+# webkitpy before any errors or log messages due to code in this file.
+# Initialization code can include things like version-checking code and
+# logging configuration code.
+#
+# We do not execute any version-checking code or logging configuration
+# code in this file so that callers can opt-in as they want. This also
+# allows different callers to choose different initialization code,
+# as necessary.
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_builder__init__py"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py (0 => 183443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py 2015-04-28 01:06:14 UTC (rev 183443)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+# Required for Python to search this directory for module files
+
+# Keep this file free of any code or import statements that could
+# cause either an error to occur or a log message to be logged.
+# This ensures that calling code can import initialization code from
+# webkitpy before any errors or log messages due to code in this file.
+# Initialization code can include things like version-checking code and
+# logging configuration code.
+#
+# We do not execute any version-checking code or logging configuration
+# code in this file so that callers can opt-in as they want. This also
+# allows different callers to choose different initialization code,
+# as necessary.
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (183442 => 183443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-04-28 00:59:13 UTC (rev 183442)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2015-04-28 01:06:14 UTC (rev 183443)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> self.httpServerDriver = HTTPServerDriverFactory.create([self.plan['http_server_driver']])
</span><span class="cx"> self.benchmarks = self.plan['benchmarks']
</span><span class="cx"> self.buildDir = os.path.abspath(buildDir)
</span><del>- self.outputFile = outputFile if outputFile else 'benchmark.result'
</del><ins>+ self.outputFile = outputFile
</ins><span class="cx"> except IOError:
</span><span class="cx"> _log.error('Can not open plan file: %s' % planFile)
</span><span class="cx"> except ValueError:
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> with timeout(benchmark['timeout']):
</span><span class="cx"> result = json.loads(self.httpServerDriver.fetchResult())
</span><span class="cx"> assert(result)
</span><ins>+ results.append(result)
</ins><span class="cx"> except:
</span><span class="cx"> _log.error('No result. Something went wrong. Will skip current benchmark.')
</span><span class="cx"> self.browserDriver.closeBrowsers()
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> self.browserDriver.closeBrowsers()
</span><span class="cx"> _log.info('End of %d iteration of current benchmark' % (x + 1))
</span><span class="cx"> results = self.wrap(results)
</span><del>- self.dump(results, benchmark['output_file'] if benchmark['output_file'] else self.outputFile)
</del><ins>+ self.dump(results, self.outputFile if self.outputFile else benchmark['output_file'])
</ins><span class="cx"> benchmarkBuilder.clean()
</span><span class="cx">
</span><span class="cx"> @classmethod
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driver__init__py"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py (0 => 183443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/__init__.py 2015-04-28 01:06:14 UTC (rev 183443)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+# Required for Python to search this directory for module files
+
+# Keep this file free of any code or import statements that could
+# cause either an error to occur or a log message to be logged.
+# This ensures that calling code can import initialization code from
+# webkitpy before any errors or log messages due to code in this file.
+# Initialization code can include things like version-checking code and
+# logging configuration code.
+#
+# We do not execute any version-checking code or logging configuration
+# code in this file so that callers can opt-in as they want. This also
+# allows different callers to choose different initialization code,
+# as necessary.
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driver__init__py"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py (0 => 183443)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py 2015-04-28 01:06:14 UTC (rev 183443)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+# Required for Python to search this directory for module files
+
+# Keep this file free of any code or import statements that could
+# cause either an error to occur or a log message to be logged.
+# This ensures that calling code can import initialization code from
+# webkitpy before any errors or log messages due to code in this file.
+# Initialization code can include things like version-checking code and
+# logging configuration code.
+#
+# We do not execute any version-checking code or logging configuration
+# code in this file so that callers can opt-in as they want. This also
+# allows different callers to choose different initialization code,
+# as necessary.
</ins></span></pre>
</div>
</div>
</body>
</html>