<!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>[186665] 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/186665">186665</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-09 22:31:50 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Quick fix for run_benchmark script that AppKit.NSRunningApplication does not work properly
https://bugs.webkit.org/show_bug.cgi?id=146820
Patch by Dewei Zhu <dewei_zhu@apple.com> on 2015-07-09
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver):
(OSXBrowserDriver.close_browsers):
(OSXBrowserDriver._terminiate_processes):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
(OSXChromeDriver):
(OSXChromeCanaryDriver):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
(OSXFirefoxDriver):
(OSXFirefoxNightlyDriver):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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_chrome_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_firefox_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (186664 => 186665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/ChangeLog 2015-07-10 05:31:50 UTC (rev 186665)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-09 Dewei Zhu <dewei_zhu@apple.com>
+
+ Quick fix for run_benchmark script that AppKit.NSRunningApplication does not work properly
+ https://bugs.webkit.org/show_bug.cgi?id=146820
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+ (OSXBrowserDriver):
+ (OSXBrowserDriver.close_browsers):
+ (OSXBrowserDriver._terminiate_processes):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
+ (OSXChromeDriver):
+ (OSXChromeCanaryDriver):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
+ (OSXFirefoxDriver):
+ (OSXFirefoxNightlyDriver):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver):
+
</ins><span class="cx"> 2015-07-09 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] pango should be included in the default jhbuild moduleset
</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 (186664 => 186665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-07-10 05:31:50 UTC (rev 186665)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class OSXBrowserDriver(BrowserDriver):
</span><del>- bundle_identifier = None
</del><ins>+ process_name = None
</ins><span class="cx"> platform = 'osx'
</span><span class="cx">
</span><span class="cx"> def prepare_env(self, device_id):
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> CGWarpMouseCursorPosition((10, 0))
</span><span class="cx">
</span><span class="cx"> def close_browsers(self):
</span><del>- self._terminiate_processes(self.bundle_identifier)
</del><ins>+ self._terminiate_processes(self.process_name)
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def _launch_process(cls, build_dir, app_name, url, args):
</span><span class="lines">@@ -34,12 +34,9 @@
</span><span class="cx"> cls._launch_process_with_caffinate(args)
</span><span class="cx">
</span><span class="cx"> @classmethod
</span><del>- def _terminiate_processes(cls, bundle_identifier):
- _log.info('Closing all terminating all processes with the bundle identifier %s' % bundle_identifier)
- from AppKit import NSRunningApplication
- processes = NSRunningApplication.runningApplicationsWithBundleIdentifier_(bundle_identifier)
- for process in processes:
- process.terminate()
</del><ins>+ def _terminiate_processes(cls, process_name):
+ _log.info('Closing all terminating all processes with name %s' % process_name)
+ subprocess.call(['/usr/bin/killall', process_name])
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def _launch_process_with_caffinate(cls, args, env=None):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_chrome_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py (186664 => 186665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2015-07-10 05:31:50 UTC (rev 186665)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class OSXChromeDriver(OSXBrowserDriver):
</span><del>- bundle_identifier = 'com.google.Chrome'
</del><ins>+ process_name = 'Google Chrome'
</ins><span class="cx"> browser_name = 'chrome'
</span><span class="cx">
</span><span class="cx"> def launch_url(self, url, browser_build_path):
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class OSXChromeCanaryDriver(OSXBrowserDriver):
</span><del>- bundle_identifier = 'com.google.Chrome.canary'
</del><ins>+ process_name = 'Google Chrome Canary'
</ins><span class="cx"> browser_name = 'chrome-canary'
</span><span class="cx">
</span><span class="cx"> def launch_url(self, url, browser_build_path):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_firefox_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py (186664 => 186665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py 2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py 2015-07-10 05:31:50 UTC (rev 186665)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class OSXFirefoxDriver(OSXBrowserDriver):
</span><del>- bundle_identifier = 'org.mozilla.firefox'
</del><ins>+ process_name = 'firefox'
</ins><span class="cx"> browser_name = 'firefox'
</span><span class="cx">
</span><span class="cx"> def launch_url(self, url, browser_build_path):
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class OSXFirefoxNightlyDriver(OSXBrowserDriver):
</span><del>- bundle_identifier = 'org.mozilla.nightly'
</del><ins>+ process_name = 'firefox'
</ins><span class="cx"> browser_name = 'firefox-nightly'
</span><span class="cx">
</span><span class="cx"> def launch_url(self, url, browser_build_path):
</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 (186664 => 186665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-07-10 05:31:50 UTC (rev 186665)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class OSXSafariDriver(OSXBrowserDriver):
</span><del>- bundle_identifier = 'com.apple.Safari'
</del><ins>+ process_name = 'Safari'
</ins><span class="cx"> browser_name = 'safari'
</span><span class="cx">
</span><span class="cx"> def prepare_env(self, device_id):
</span></span></pre>
</div>
</div>
</body>
</html>