Diff
Modified: trunk/Tools/ChangeLog (186664 => 186665)
--- trunk/Tools/ChangeLog 2015-07-10 05:18:53 UTC (rev 186664)
+++ trunk/Tools/ChangeLog 2015-07-10 05:31:50 UTC (rev 186665)
@@ -1,3 +1,23 @@
+2015-07-09 Dewei Zhu <dewei_...@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):
+
2015-07-09 Michael Catanzaro <mcatanz...@igalia.com>
[GTK] pango should be included in the default jhbuild moduleset
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py (186664 => 186665)
--- 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)
@@ -10,7 +10,7 @@
class OSXBrowserDriver(BrowserDriver):
- bundle_identifier = None
+ process_name = None
platform = 'osx'
def prepare_env(self, device_id):
@@ -19,7 +19,7 @@
CGWarpMouseCursorPosition((10, 0))
def close_browsers(self):
- self._terminiate_processes(self.bundle_identifier)
+ self._terminiate_processes(self.process_name)
@classmethod
def _launch_process(cls, build_dir, app_name, url, args):
@@ -34,12 +34,9 @@
cls._launch_process_with_caffinate(args)
@classmethod
- 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()
+ 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])
@classmethod
def _launch_process_with_caffinate(cls, args, env=None):
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py (186664 => 186665)
--- 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)
@@ -12,7 +12,7 @@
class OSXChromeDriver(OSXBrowserDriver):
- bundle_identifier = 'com.google.Chrome'
+ process_name = 'Google Chrome'
browser_name = 'chrome'
def launch_url(self, url, browser_build_path):
@@ -20,7 +20,7 @@
class OSXChromeCanaryDriver(OSXBrowserDriver):
- bundle_identifier = 'com.google.Chrome.canary'
+ process_name = 'Google Chrome Canary'
browser_name = 'chrome-canary'
def launch_url(self, url, browser_build_path):
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py (186664 => 186665)
--- 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)
@@ -12,7 +12,7 @@
class OSXFirefoxDriver(OSXBrowserDriver):
- bundle_identifier = 'org.mozilla.firefox'
+ process_name = 'firefox'
browser_name = 'firefox'
def launch_url(self, url, browser_build_path):
@@ -20,7 +20,7 @@
class OSXFirefoxNightlyDriver(OSXBrowserDriver):
- bundle_identifier = 'org.mozilla.nightly'
+ process_name = 'firefox'
browser_name = 'firefox-nightly'
def launch_url(self, url, browser_build_path):
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (186664 => 186665)
--- 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)
@@ -14,7 +14,7 @@
class OSXSafariDriver(OSXBrowserDriver):
- bundle_identifier = 'com.apple.Safari'
+ process_name = 'Safari'
browser_name = 'safari'
def prepare_env(self, device_id):
