<!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>[184109] 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/184109">184109</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 11:02:57 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-benchmark should support Chrome Canary and Firefox Nightly
https://bugs.webkit.org/show_bug.cgi?id=144850
Reviewed by Darin Adler.
Added the support for Chrome Canary, Firefox (release), and Firefox Nightly.
This patch also extracts OSXBrowserDriver to launch and terminate processes on OS X.
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json:
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py: Added.
(OSXBrowserDriver):
(OSXBrowserDriver.prepareEnv): Extracted from ChromeBrowserDriver.prepareEnv.
(OSXBrowserDriver.closeBrowsers): Ditto.
(OSXBrowserDriver.launchProcess): Ditto.
(OSXBrowserDriver.terminateProcesses): Ditto.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
(OSXChromeDriver): Removed the unused self.chromePreferences.
(OSXChromeDriver.prepareEnv): Moved to OSXBrowserDriver.
(OSXChromeDriver.closeBrowsers): Ditto.
(OSXChromeDriver.launchUrl):
(OSXChromeCanaryDriver): Added.
(OSXChromeCanaryDriver.launchUrl):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py: Added.
(OSXFirefoxDriver): Added.
(OSXFirefoxDriver.launchUrl):
(OSXFirefoxNightlyDriver): Added.
(OSXFirefoxNightlyDriver.launchUrl):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver):
(OSXSafariDriver.closeBrowsers):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driversjson">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json</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_safari_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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_firefox_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (184108 => 184109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-11 17:50:25 UTC (rev 184108)
+++ trunk/Tools/ChangeLog 2015-05-11 18:02:57 UTC (rev 184109)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2015-05-11 Ryosuke Niwa <rniwa@webkit.org>
+
+ run-benchmark should support Chrome Canary and Firefox Nightly
+ https://bugs.webkit.org/show_bug.cgi?id=144850
+
+ Reviewed by Darin Adler.
+
+ Added the support for Chrome Canary, Firefox (release), and Firefox Nightly.
+
+ This patch also extracts OSXBrowserDriver to launch and terminate processes on OS X.
+
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json:
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py: Added.
+ (OSXBrowserDriver):
+ (OSXBrowserDriver.prepareEnv): Extracted from ChromeBrowserDriver.prepareEnv.
+ (OSXBrowserDriver.closeBrowsers): Ditto.
+ (OSXBrowserDriver.launchProcess): Ditto.
+ (OSXBrowserDriver.terminateProcesses): Ditto.
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
+ (OSXChromeDriver): Removed the unused self.chromePreferences.
+ (OSXChromeDriver.prepareEnv): Moved to OSXBrowserDriver.
+ (OSXChromeDriver.closeBrowsers): Ditto.
+ (OSXChromeDriver.launchUrl):
+ (OSXChromeCanaryDriver): Added.
+ (OSXChromeCanaryDriver.launchUrl):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py: Added.
+ (OSXFirefoxDriver): Added.
+ (OSXFirefoxDriver.launchUrl):
+ (OSXFirefoxNightlyDriver): Added.
+ (OSXFirefoxNightlyDriver.launchUrl):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver):
+ (OSXSafariDriver.closeBrowsers):
+
</ins><span class="cx"> 2015-05-11 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Page overlay action context override should indicate the source of the request
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driversjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json (184108 => 184109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json 2015-05-11 17:50:25 UTC (rev 184108)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_drivers.json 2015-05-11 18:02:57 UTC (rev 184109)
</span><span class="lines">@@ -3,7 +3,19 @@
</span><span class="cx"> "chrome": {
</span><span class="cx"> "moduleName": "OSXChromeDriver",
</span><span class="cx"> "filePath": "browser_driver.osx_chrome_driver"
</span><del>- },
</del><ins>+ },
+ "chrome-canary": {
+ "moduleName": "OSXChromeCanaryDriver",
+ "filePath": "browser_driver.osx_chrome_driver"
+ },
+ "firefox": {
+ "moduleName": "OSXFirefoxDriver",
+ "filePath": "browser_driver.osx_firefox_driver"
+ },
+ "firefox-nightly": {
+ "moduleName": "OSXFirefoxNightlyDriver",
+ "filePath": "browser_driver.osx_firefox_driver"
+ },
</ins><span class="cx"> "safari": {
</span><span class="cx"> "moduleName": "OSXSafariDriver",
</span><span class="cx"> "filePath": "browser_driver.osx_safari_driver"
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_browser_driverpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (0 => 184109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-05-11 18:02:57 UTC (rev 184109)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+
+import logging
+import os
+import subprocess
+
+from AppKit import NSRunningApplication
+from browser_driver import BrowserDriver
+
+
+_log = logging.getLogger(__name__)
+
+
+class OSXBrowserDriver(BrowserDriver):
+ bundleIdentifier = None
+
+ def prepareEnv(self):
+ self.closeBrowsers()
+
+ def closeBrowsers(self):
+ self.terminateProcesses(self.bundleIdentifier)
+
+ @classmethod
+ def launchProcess(cls, buildDir, appName, url, args):
+ if not buildDir:
+ buildDir = '/Applications/'
+ appPath = os.path.join(buildDir, appName)
+
+ _log.info('Launching "%s" with url "%s"' % (appPath, url))
+
+ # FIXME: May need to be modified for a local build such as setting up DYLD libraries
+ subprocess.Popen((['open', '-a', appPath] + args)).communicate()
+
+ @classmethod
+ def terminateProcesses(cls, bundleIdentifier):
+ _log.info('Closing all terminating all processes with the bundle identifier %s' % bundleIdentifier)
+ processes = NSRunningApplication.runningApplicationsWithBundleIdentifier_(bundleIdentifier)
+ for process in processes:
+ process.terminate()
</ins></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 (184108 => 184109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2015-05-11 17:50:25 UTC (rev 184108)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2015-05-11 18:02:57 UTC (rev 184109)
</span><span class="lines">@@ -5,29 +5,21 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> import time
</span><span class="cx">
</span><del>-# We assume that this handle can only be used when the platform is OSX
-from AppKit import NSRunningApplication
-from browser_driver import BrowserDriver
</del><ins>+from osx_browser_driver import OSXBrowserDriver
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx">
</span><span class="cx">
</span><del>-class OSXChromeDriver(BrowserDriver):
</del><ins>+class OSXChromeDriver(OSXBrowserDriver):
+ bundleIdentifier = 'com.google.Chrome'
</ins><span class="cx">
</span><del>- def prepareEnv(self):
- self.closeBrowsers()
- self.chromePreferences = []
-
</del><span class="cx"> def launchUrl(self, url, browserBuildPath):
</span><del>- if not browserBuildPath:
- browserBuildPath = '/Applications/'
- _log.info('Launching chrome: %s with url: %s' % (os.path.join(browserBuildPath, 'Google Chrome.app'), url))
- # FIXME: May need to be modified for develop build, such as setting up libraries
- subprocess.Popen(['open', '-a', os.path.join(browserBuildPath, 'Google Chrome.app'), '--args', '--homepage', url] + self.chromePreferences).communicate()
</del><ins>+ self.launchProcess(buildDir=browserBuildPath, appName='Google Chrome.app', url=url, args=['--args', '--homepage', url])
</ins><span class="cx">
</span><del>- def closeBrowsers(self):
- _log.info('Closing all existing chrome processes')
- chromes = NSRunningApplication.runningApplicationsWithBundleIdentifier_('com.google.Chrome')
- for chrome in chromes:
- chrome.terminate()
</del><ins>+
+class OSXChromeCanaryDriver(OSXBrowserDriver):
+ bundleIdentifier = 'com.google.Chrome.canary'
+
+ def launchUrl(self, url, browserBuildPath):
+ self.launchProcess(buildDir=browserBuildPath, appName='Google Chrome Canary.app', url=url, args=['--args', '--homepage', url])
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverosx_firefox_driverpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py (0 => 184109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py 2015-05-11 18:02:57 UTC (rev 184109)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+#!/usr/bin/env python
+
+import logging
+import os
+import subprocess
+import time
+
+from osx_browser_driver import OSXBrowserDriver
+
+
+_log = logging.getLogger(__name__)
+
+
+class OSXFirefoxDriver(OSXBrowserDriver):
+ bundleIdentifier = 'org.mozilla.firefox'
+
+ def launchUrl(self, url, browserBuildPath):
+ self.launchProcess(buildDir=browserBuildPath, appName='Firefox.app', url=url, args=[url])
+
+
+class OSXFirefoxNightlyDriver(OSXBrowserDriver):
+ bundleIdentifier = 'org.mozilla.nightly'
+
+ def launchUrl(self, url, browserBuildPath):
+ self.launchProcess(buildDir=browserBuildPath, appName='FirefoxNightly.app', url=url, args=[url])
</ins></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 (184108 => 184109)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-05-11 17:50:25 UTC (rev 184108)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-05-11 18:02:57 UTC (rev 184109)
</span><span class="lines">@@ -5,16 +5,14 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> import time
</span><span class="cx">
</span><del>-# We assume that this handle can only be used when the platform is OSX.
-from AppKit import NSRunningApplication
-from browser_driver import BrowserDriver
</del><ins>+from osx_browser_driver import OSXBrowserDriver
</ins><span class="cx"> from webkitpy.benchmark_runner.utils import forceRemove
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx">
</span><span class="cx">
</span><del>-class OSXSafariDriver(BrowserDriver):
</del><ins>+class OSXSafariDriver(OSXBrowserDriver):
</ins><span class="cx">
</span><span class="cx"> def prepareEnv(self):
</span><span class="cx"> self.safariProcess = None
</span><span class="lines">@@ -43,10 +41,7 @@
</span><span class="cx"> subprocess.Popen(['open', url])
</span><span class="cx">
</span><span class="cx"> def closeBrowsers(self):
</span><del>- _log.info('Closing all existing safari processes')
- safariInstances = NSRunningApplication.runningApplicationsWithBundleIdentifier_('com.apple.Safari')
- for safariInstance in safariInstances:
- safariInstance.terminate()
</del><ins>+ self.terminateProcesses('com.apple.Safari')
</ins><span class="cx"> if self.safariProcess:
</span><span class="cx"> _log.info('Safari process console output:\nstdout: %s\nstderr: %s' % self.safariProcess.communicate())
</span><span class="cx"> if self.safariProcess.returncode:
</span></span></pre>
</div>
</div>
</body>
</html>