Yet another unreviewed build fix :(
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Jun 2015 00:47:25 +0000 (00:47 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 9 Jun 2015 00:47:25 +0000 (00:47 +0000)
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver):
(OSXSafariDriver.launchUrl):
(OSXSafariDriver.closeBrowsers):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185345 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py

index 1b00a6999e56ca810360213f07fad643b4a34124..c15abdda0fe71747d05f15d5277b2f52189fe2b1 100644 (file)
@@ -1,3 +1,12 @@
+2015-06-08  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Yet another unreviewed build fix :(
+
+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+        (OSXSafariDriver):
+        (OSXSafariDriver.launchUrl):
+        (OSXSafariDriver.closeBrowsers):
+
 2015-06-08  Ryosuke Niwa  <rniwa@webkit.org>
 
         Unreviewed build fix. Initialize result in the case things blow up below.
index 0c49601cb6d333a3b634c8fe5d143b3f5f41b10b..b426801712d8f1f4835e80dbfb4092a521c48b48 100644 (file)
@@ -13,6 +13,7 @@ _log = logging.getLogger(__name__)
 
 
 class OSXSafariDriver(OSXBrowserDriver):
+    bundleIdentifier = 'com.apple.Safari'
 
     def prepareEnv(self):
         self.safariProcess = None
@@ -42,7 +43,6 @@ class OSXSafariDriver(OSXBrowserDriver):
         subprocess.Popen(['open', url])
 
     def closeBrowsers(self):
-        if self.safariProcess:
-            self.terminateProcesses('com.apple.Safari')
-            if self.safariProcess.returncode:
-                _log.error('Safari Crashed!')
+        self.closeBrowsers()
+        if self.safariProcess and self.safariProcess.returncode:
+            sys.exit('Browser crashed with exitcode %d' % self._process.returncode)