<!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>[185242] 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/185242">185242</a></dd>
<dt>Author</dt> <dd>slewis@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 02:11:18 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Streamline run-benchmark browser
Reviewed by Ryosuke Niwa.
Add Caffeinate so computer won't sleep while running.
Remove calls to collect output since we were just dumping to stdout anyway.
Add xpc dyld_path.
Default to system safari.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
(OSXBrowserDriver.launchProcess):
(OSXBrowserDriver.terminateProcesses):
(OSXBrowserDriver):
(OSXBrowserDriver.launchCaffeinateForProcess):
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.launchUrl):
(OSXSafariDriver.closeBrowsers):</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_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 (185241 => 185242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-05 06:44:55 UTC (rev 185241)
+++ trunk/Tools/ChangeLog 2015-06-05 09:11:18 UTC (rev 185242)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-05 Stephanie Lewis <slewis@apple.com>
+
+ Streamline run-benchmark browser
+
+ Reviewed by Ryosuke Niwa.
+
+ Add Caffeinate so computer won't sleep while running.
+ Remove calls to collect output since we were just dumping to stdout anyway.
+ Add xpc dyld_path.
+ Default to system safari.
+
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
+ (OSXBrowserDriver.launchProcess):
+ (OSXBrowserDriver.terminateProcesses):
+ (OSXBrowserDriver):
+ (OSXBrowserDriver.launchCaffeinateForProcess):
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver.launchUrl):
+ (OSXSafariDriver.closeBrowsers):
+
</ins><span class="cx"> 2015-06-04 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Combine tiny DFAs into slightly larger ones
</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 (185241 => 185242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-06-05 06:44:55 UTC (rev 185241)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py 2015-06-05 09:11:18 UTC (rev 185242)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx"> _log.info('Launching "%s" with url "%s"' % (appPath, url))
</span><span class="cx">
</span><span class="cx"> # FIXME: May need to be modified for a local build such as setting up DYLD libraries
</span><del>- subprocess.Popen((['open', '-a', appPath] + args)).communicate()
</del><ins>+ args = ['open', '-a', appPath] + args
+ cls.launchProcessWithCaffinate(args)
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def terminateProcesses(cls, bundleIdentifier):
</span><span class="lines">@@ -36,3 +37,9 @@
</span><span class="cx"> processes = NSRunningApplication.runningApplicationsWithBundleIdentifier_(bundleIdentifier)
</span><span class="cx"> for process in processes:
</span><span class="cx"> process.terminate()
</span><ins>+
+ @classmethod
+ def launchProcessWithCaffinate(cls, args, env=None):
+ process = subprocess.Popen(args, env=env)
+ subprocess.Popen(["/usr/bin/caffeinate", "-disw", str(process.pid)])
+ return process
</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 (185241 => 185242)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-06-05 06:44:55 UTC (rev 185241)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2015-06-05 09:11:18 UTC (rev 185242)
</span><span class="lines">@@ -22,27 +22,27 @@
</span><span class="cx"> self.safariPreferences = ["-HomePage", "about:blank", "-WarnAboutFraudulentWebsites", "0", "-ExtensionsEnabled", "0", "-ShowStatusBar", "0", "-NewWindowBehavior", "1", "-NewTabBehavior", "1"]
</span><span class="cx">
</span><span class="cx"> def launchUrl(self, url, browserBuildPath):
</span><del>- args = ['/Applications/Safari.app/Contents/MacOS/SafariForWebKitDevelopment']
</del><ins>+ args = ['/Applications/Safari.app/Contents/MacOS/Safari']
</ins><span class="cx"> env = {}
</span><span class="cx"> if browserBuildPath:
</span><span class="cx"> safariAppInBuildPath = os.path.join(browserBuildPath, 'Safari.app/Contents/MacOS/Safari')
</span><span class="cx"> if os.path.exists(safariAppInBuildPath):
</span><span class="cx"> args = [safariAppInBuildPath]
</span><del>- env = {'DYLD_FRAMEWORK_PATH': browserBuildPath, 'DYLD_LIBRARY_PATH': browserBuildPath}
</del><ins>+ env = {'DYLD_FRAMEWORK_PATH': browserBuildPath, 'DYLD_LIBRARY_PATH': browserBuildPath, '__XPC_DYLD_LIBRARY_PATH': browserBuildPath}
</ins><span class="cx"> else:
</span><del>- _log.info('Could not find Safari.app at %s, using the system SafariForWebKitDevelopment in /Applications instead' % safariAppInBuildPath)
</del><ins>+ _log.info('Could not find Safari.app at %s, using the system Safari instead' % safariAppInBuildPath)
</ins><span class="cx">
</span><span class="cx"> args.extend(self.safariPreferences)
</span><span class="cx"> _log.info('Launching safari: %s with url: %s' % (args[0], url))
</span><del>- self.safariProcess = subprocess.Popen(args, env=env, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
</del><ins>+ self.safariProcess = OSXSafariDriver.launchProcessWithCaffinate(args, env)
+
</ins><span class="cx"> # Stop for initialization of the safari process, otherwise, open
</span><span class="cx"> # command may use the system safari.
</span><span class="cx"> time.sleep(3)
</span><span class="cx"> subprocess.Popen(['open', url])
</span><span class="cx">
</span><span class="cx"> def closeBrowsers(self):
</span><del>- self.terminateProcesses('com.apple.Safari')
</del><span class="cx"> if self.safariProcess:
</span><del>- _log.info('Safari process console output:\nstdout: %s\nstderr: %s' % self.safariProcess.communicate())
</del><ins>+ self.terminateProcesses('com.apple.Safari')
</ins><span class="cx"> if self.safariProcess.returncode:
</span><span class="cx"> _log.error('Safari Crashed!')
</span></span></pre>
</div>
</div>
</body>
</html>