Modified: trunk/Tools/ChangeLog (291324 => 291325)
--- trunk/Tools/ChangeLog 2022-03-16 00:51:40 UTC (rev 291324)
+++ trunk/Tools/ChangeLog 2022-03-16 02:35:33 UTC (rev 291325)
@@ -1,3 +1,20 @@
+2022-03-15 Saam Barati <sbar...@apple.com>
+
+ Add support for chrome-beta and chrome-dev to run-benchmark
+ https://bugs.webkit.org/show_bug.cgi?id=237937
+
+ Reviewed by Stephanie Lewis.
+
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
+ (set_binary_location_impl):
+ (OSXChromeDriver._set_chrome_binary_location):
+ (OSXChromeCanaryDriver):
+ (OSXChromeCanaryDriver._set_chrome_binary_location):
+ (OSXChromeBetaDriver):
+ (OSXChromeBetaDriver._set_chrome_binary_location):
+ (OSXChromeDevDriver):
+ (OSXChromeDevDriver._set_chrome_binary_location):
+
2022-03-15 Jonathan Bedard <jbed...@apple.com>
[Merge-Queue] Rename bugzilla_comment_text
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py (291324 => 291325)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2022-03-16 00:51:40 UTC (rev 291324)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py 2022-03-16 02:35:33 UTC (rev 291325)
@@ -41,7 +41,14 @@
def _set_chrome_binary_location(self, options, browser_build_path):
pass
+def set_binary_location_impl(options, browser_build_path, app_name, process_name):
+ if not browser_build_path:
+ return
+ app_path = os.path.join(browser_build_path, app_name)
+ binary_path = os.path.join(app_path, "Contents/MacOS", process_name)
+ options.binary_location = binary_path
+
class OSXChromeDriver(OSXChromeDriverBase):
process_name = 'Google Chrome'
browser_name = 'chrome'
@@ -49,14 +56,10 @@
bundle_id = 'com.google.Chrome'
def _set_chrome_binary_location(self, options, browser_build_path):
- if not browser_build_path:
- return
- app_path = os.path.join(browser_build_path, self.app_name)
- binary_path = os.path.join(app_path, "Contents/MacOS", self.process_name)
- options.binary_location = binary_path
+ set_binary_location_impl(options, browser_build_path, self.app_name, self.process_name)
-class OSXChromeCanaryDriver(OSXBrowserDriver):
+class OSXChromeCanaryDriver(OSXChromeDriverBase):
process_name = 'Google Chrome Canary'
browser_name = 'chrome-canary'
app_name = 'Google Chrome Canary.app'
@@ -63,8 +66,23 @@
bundle_id = 'com.google.Chrome.canary'
def _set_chrome_binary_location(self, options, browser_build_path):
- if not browser_build_path:
- browser_build_path = '/Applications/'
- app_path = os.path.join(browser_build_path, self.app_name)
- binary_path = os.path.join(app_path, "Contents/MacOS", self.process_name)
- options.binary_location = binary_path
+ set_binary_location_impl(options, browser_build_path, self.app_name, self.process_name)
+
+
+class OSXChromeBetaDriver(OSXChromeDriverBase):
+ process_name = 'Google Chrome Beta'
+ browser_name = 'chrome-beta'
+ app_name = 'Google Chrome Beta.app'
+ bundle_id = 'com.google.Chrome.beta'
+
+ def _set_chrome_binary_location(self, options, browser_build_path):
+ set_binary_location_impl(options, browser_build_path, self.app_name, self.process_name)
+
+class OSXChromeDevDriver(OSXChromeDriverBase):
+ process_name = 'Google Chrome Dev'
+ browser_name = 'chrome-dev'
+ app_name = 'Google Chrome Dev.app'
+ bundle_id = 'com.google.Chrome.dev'
+
+ def _set_chrome_binary_location(self, options, browser_build_path):
+ set_binary_location_impl(options, browser_build_path, self.app_name, self.process_name)
