<!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>[211549] 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/211549">211549</a></dd>
<dt>Author</dt> <dd>dewei_zhu@apple.com</dd>
<dt>Date</dt> <dd>2017-02-01 19:10:58 -0800 (Wed, 01 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make run-benchmark script supports 'config' key in test plan.
https://bugs.webkit.org/show_bug.cgi?id=167715
Reviewed by Ryosuke Niwa.
Add support for 'config' key in test paln.
'config' key is a dictionary that specifies environment configurations while test is running.
Specifies orientation to be portrait in MotionMark benchmark.
* Scripts/webkitpy/benchmark_runner/README.md:
* Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
(BenchmarkRunner.__init__):
(BenchmarkRunner._run_benchmark):
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
(BrowserDriver.prepare_env):
* Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py:
(LinuxBrowserDriver.prepare_env):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver.prepare_env):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.prepare_env):
* Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerREADMEmd">trunk/Tools/Scripts/webkitpy/benchmark_runner/README.md</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverlinux_browser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerdataplansmotionmarkplan">trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211548 => 211549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-02 01:57:00 UTC (rev 211548)
+++ trunk/Tools/ChangeLog 2017-02-02 03:10:58 UTC (rev 211549)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-02-01 Dewei Zhu <dewei_zhu@apple.com>
+
+ Make run-benchmark script supports 'config' key in test plan.
+ https://bugs.webkit.org/show_bug.cgi?id=167715
+
+ Reviewed by Ryosuke Niwa.
+
+ Add support for 'config' key in test paln.
+ 'config' key is a dictionary that specifies environment configurations while test is running.
+ Specifies orientation to be portrait in MotionMark benchmark.
+
+ * Scripts/webkitpy/benchmark_runner/README.md:
+ * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
+ (BenchmarkRunner.__init__):
+ (BenchmarkRunner._run_benchmark):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
+ (BrowserDriver.prepare_env):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py:
+ (LinuxBrowserDriver.prepare_env):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+ (OSXBrowserDriver.prepare_env):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver.prepare_env):
+ * Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan:
+
</ins><span class="cx"> 2017-02-01 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r210820): svn-create-patch does not emit property change only diff
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerREADMEmd"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/README.md (211548 => 211549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/README.md 2017-02-02 01:57:00 UTC (rev 211548)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/README.md 2017-02-02 03:10:58 UTC (rev 211549)
</span><span class="lines">@@ -69,6 +69,9 @@
</span><span class="cx"> "local_copy": "../../../../PerformanceTests/JetStream",
</span><span class="cx"> "benchmark_patch": "data/patches/JetStream.patch",
</span><span class="cx"> "entry_point": "JetStream/JetStream-1.0.1/index.html",
</span><ins>+ "config": {
+ "orientation": "portrait"
+ },
</ins><span class="cx"> "output_file": "jetstream.result"
</span><span class="cx"> }
</span><span class="cx"> ```
</span><span class="lines">@@ -79,6 +82,7 @@
</span><span class="cx"> * **remote_archive**: (**OPTIONAL**) URL of the remote (http/https) ZIP file that contains the benchmark.
</span><span class="cx"> * **benchmark_path**: (**OPTIONAL**) path of patch, a relative path to the root of this project ('benchmark_runner' directory)
</span><span class="cx"> * **entry_point**: the relative url you want browser to launch (a relative path to the benchmark directory)
</span><ins>+* **config**: a dictionary that specifies the environment configurations for the test (e.g. orientation while the test is running)
</ins><span class="cx"> * **output_file**: specify the output file, this can be overwritten by specifying '--output-file' while invoking run-benchmark script
</span><span class="cx">
</span><span class="cx"> ### How to import a benchmark
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py (211548 => 211549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2017-02-02 01:57:00 UTC (rev 211548)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py 2017-02-02 03:10:58 UTC (rev 211549)
</span><span class="lines">@@ -42,7 +42,9 @@
</span><span class="cx"> self._build_dir = os.path.abspath(build_dir) if build_dir else None
</span><span class="cx"> self._output_file = output_file
</span><span class="cx"> self._scale_unit = scale_unit
</span><del>- self._device_id = device_id
</del><ins>+ self._config = self._plan.get('config', {})
+ if device_id:
+ self._config['device_id'] = device_id
</ins><span class="cx"> except IOError as error:
</span><span class="cx"> _log.error('Can not open plan file: {plan_file} - Error {error}'.format(plan_file=plan_file, error=error))
</span><span class="cx"> raise error
</span><span class="lines">@@ -86,7 +88,7 @@
</span><span class="cx"> for iteration in xrange(1, count + 1):
</span><span class="cx"> _log.info('Start the iteration {current_iteration} of {iterations} for current benchmark'.format(current_iteration=iteration, iterations=count))
</span><span class="cx"> try:
</span><del>- self._browser_driver.prepare_env(self._device_id)
</del><ins>+ self._browser_driver.prepare_env(self._config)
</ins><span class="cx">
</span><span class="cx"> if 'entry_point' in self._plan:
</span><span class="cx"> result = self._run_one_test(web_root, self._plan['entry_point'])
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py (211548 => 211549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2017-02-02 01:57:00 UTC (rev 211548)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2017-02-02 03:10:58 UTC (rev 211549)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> ___metaclass___ = ABCMeta
</span><span class="cx">
</span><span class="cx"> @abstractmethod
</span><del>- def prepare_env(self, device_id):
</del><ins>+ def prepare_env(self, config):
</ins><span class="cx"> pass
</span><span class="cx">
</span><span class="cx"> @abstractmethod
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverlinux_browser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py (211548 => 211549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py 2017-02-02 01:57:00 UTC (rev 211548)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py 2017-02-02 03:10:58 UTC (rev 211549)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> raise ValueError('Cant find executable for browser {browser_name}. Searched list: {browser_process_list}'.format(
</span><span class="cx"> browser_name=self.browser_name, browser_process_list=self.process_search_list))
</span><span class="cx">
</span><del>- def prepare_env(self, device_id):
</del><ins>+ def prepare_env(self, config):
</ins><span class="cx"> self._browser_process = None
</span><span class="cx"> self._browser_arguments = None
</span><span class="cx"> self._temp_profiledir = tempfile.mkdtemp()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (211548 => 211549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2017-02-02 01:57:00 UTC (rev 211548)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2017-02-02 03:10:58 UTC (rev 211549)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> process_name = None
</span><span class="cx"> platform = 'osx'
</span><span class="cx">
</span><del>- def prepare_env(self, device_id):
</del><ins>+ def prepare_env(self, config):
</ins><span class="cx"> self.close_browsers()
</span><span class="cx"> from Quartz import CGWarpMouseCursorPosition
</span><span class="cx"> CGWarpMouseCursorPosition((10, 0))
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_safari_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (211548 => 211549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2017-02-02 01:57:00 UTC (rev 211548)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2017-02-02 03:10:58 UTC (rev 211549)
</span><span class="lines">@@ -17,9 +17,9 @@
</span><span class="cx"> process_name = 'Safari'
</span><span class="cx"> browser_name = 'safari'
</span><span class="cx">
</span><del>- def prepare_env(self, device_id):
</del><ins>+ def prepare_env(self, config):
</ins><span class="cx"> self._safari_process = None
</span><del>- super(OSXSafariDriver, self).prepare_env(device_id)
</del><ins>+ super(OSXSafariDriver, self).prepare_env(config)
</ins><span class="cx"> force_remove(os.path.join(os.path.expanduser('~'), 'Library/Saved Application State/com.apple.Safari.savedState'))
</span><span class="cx"> force_remove(os.path.join(os.path.expanduser('~'), 'Library/Safari/LastSession.plist'))
</span><span class="cx"> self._maximize_window()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerdataplansmotionmarkplan"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan (211548 => 211549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan 2017-02-02 01:57:00 UTC (rev 211548)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/data/plans/motionmark.plan 2017-02-02 03:10:58 UTC (rev 211549)
</span><span class="lines">@@ -4,5 +4,8 @@
</span><span class="cx"> "svn_source": "https://svn.webkit.org/repository/webkit/trunk/PerformanceTests/MotionMark/@r210459",
</span><span class="cx"> "benchmark_patch": "data/patches/MotionMark.patch",
</span><span class="cx"> "entry_point": "index.html",
</span><ins>+ "config": {
+ "orientation": "landscape"
+ },
</ins><span class="cx"> "output_file": "motionmark.result"
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>