237937 2022-03-15 19:20:14 -0700 Add support for chrome-beta and chrome-dev to run-benchmark 2022-03-16 11:58:55 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam ap dewei_zhu ews-watchlist glenn jbedard slewis webkit-bug-importer oldest_to_newest 1851613 0 saam 2022-03-15 19:20:14 -0700 ... 1851614 1 454787 saam 2022-03-15 19:23:26 -0700 Created attachment 454787 [fast-cq] patch 1851619 2 ews-feeder 2022-03-15 19:36:47 -0700 Committed r291325 (248464@main): <https://commits.webkit.org/248464@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 454787. 1851621 3 webkit-bug-importer 2022-03-15 19:37:18 -0700 <rdar://problem/90345926> 1851923 4 454787 dewei_zhu 2022-03-16 11:58:55 -0700 Comment on attachment 454787 [fast-cq] patch View in context: https://bugs.webkit.org/attachment.cgi?id=454787&action=review > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:50 > +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 > + It looks like we can just move this to `OSXChromeDriverBase._set_chrome_binary_location`. So that we don't need to repeat it in the derived classes. > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:-67 > - if not browser_build_path: > - browser_build_path = '/Applications/' Could you explain why we want to stop loading it from '/Applications'? If we move set_binary_location_impl to `OSXChromeDriverBase._set_chrome_binary_location` & if we want to keep this behavior, we just do if not browser_build_path: browser_build_path = '/Applications/' super(OSXChromeCanaryDriver, self)._set_chrome_binary_location(options, browser_build_path) 454787 2022-03-15 19:23:26 -0700 2022-03-15 20:10:07 -0700 [fast-cq] patch c-backup.diff text/plain 3849 saam SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI5MTMyNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDIyLTAzLTE1ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgor CisgICAgICAgIEFkZCBzdXBwb3J0IGZvciBjaHJvbWUtYmV0YSBhbmQgY2hyb21lLWRldiB0byBy dW4tYmVuY2htYXJrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMzc5MzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9v c3hfY2hyb21lX2RyaXZlci5weToKKyAgICAgICAgKHNldF9iaW5hcnlfbG9jYXRpb25faW1wbCk6 CisgICAgICAgIChPU1hDaHJvbWVEcml2ZXIuX3NldF9jaHJvbWVfYmluYXJ5X2xvY2F0aW9uKToK KyAgICAgICAgKE9TWENocm9tZUNhbmFyeURyaXZlcik6CisgICAgICAgIChPU1hDaHJvbWVDYW5h cnlEcml2ZXIuX3NldF9jaHJvbWVfYmluYXJ5X2xvY2F0aW9uKToKKyAgICAgICAgKE9TWENocm9t ZUJldGFEcml2ZXIpOgorICAgICAgICAoT1NYQ2hyb21lQmV0YURyaXZlci5fc2V0X2Nocm9tZV9i aW5hcnlfbG9jYXRpb24pOgorICAgICAgICAoT1NYQ2hyb21lRGV2RHJpdmVyKToKKyAgICAgICAg KE9TWENocm9tZURldkRyaXZlci5fc2V0X2Nocm9tZV9iaW5hcnlfbG9jYXRpb24pOgorCiAyMDIy LTAzLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBb TWVyZ2UtUXVldWVdIFJlbmFtZSBidWd6aWxsYV9jb21tZW50X3RleHQKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfY2hyb21l X2RyaXZlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFy a19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X2Nocm9tZV9kcml2ZXIucHkJKHJldmlzaW9uIDI5 MTMyNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2Vy X2RyaXZlci9vc3hfY2hyb21lX2RyaXZlci5weQkod29ya2luZyBjb3B5KQpAQCAtNDEsNiArNDEs MTMgQEAgY2xhc3MgT1NYQ2hyb21lRHJpdmVyQmFzZShPU1hCcm93c2VyRHJpdgogICAgIGRlZiBf c2V0X2Nocm9tZV9iaW5hcnlfbG9jYXRpb24oc2VsZiwgb3B0aW9ucywgYnJvd3Nlcl9idWlsZF9w YXRoKToKICAgICAgICAgcGFzcwogCitkZWYgc2V0X2JpbmFyeV9sb2NhdGlvbl9pbXBsKG9wdGlv bnMsIGJyb3dzZXJfYnVpbGRfcGF0aCwgYXBwX25hbWUsIHByb2Nlc3NfbmFtZSk6CisgICAgaWYg bm90IGJyb3dzZXJfYnVpbGRfcGF0aDoKKyAgICAgICAgcmV0dXJuCisgICAgYXBwX3BhdGggPSBv cy5wYXRoLmpvaW4oYnJvd3Nlcl9idWlsZF9wYXRoLCBhcHBfbmFtZSkKKyAgICBiaW5hcnlfcGF0 aCA9IG9zLnBhdGguam9pbihhcHBfcGF0aCwgIkNvbnRlbnRzL01hY09TIiwgcHJvY2Vzc19uYW1l KQorICAgIG9wdGlvbnMuYmluYXJ5X2xvY2F0aW9uID0gYmluYXJ5X3BhdGgKKwogCiBjbGFzcyBP U1hDaHJvbWVEcml2ZXIoT1NYQ2hyb21lRHJpdmVyQmFzZSk6CiAgICAgcHJvY2Vzc19uYW1lID0g J0dvb2dsZSBDaHJvbWUnCkBAIC00OSwyMiArNTYsMzMgQEAgY2xhc3MgT1NYQ2hyb21lRHJpdmVy KE9TWENocm9tZURyaXZlckJhcwogICAgIGJ1bmRsZV9pZCA9ICdjb20uZ29vZ2xlLkNocm9tZScK IAogICAgIGRlZiBfc2V0X2Nocm9tZV9iaW5hcnlfbG9jYXRpb24oc2VsZiwgb3B0aW9ucywgYnJv d3Nlcl9idWlsZF9wYXRoKToKLSAgICAgICAgaWYgbm90IGJyb3dzZXJfYnVpbGRfcGF0aDoKLSAg ICAgICAgICAgIHJldHVybgotICAgICAgICBhcHBfcGF0aCA9IG9zLnBhdGguam9pbihicm93c2Vy X2J1aWxkX3BhdGgsIHNlbGYuYXBwX25hbWUpCi0gICAgICAgIGJpbmFyeV9wYXRoID0gb3MucGF0 aC5qb2luKGFwcF9wYXRoLCAiQ29udGVudHMvTWFjT1MiLCBzZWxmLnByb2Nlc3NfbmFtZSkKLSAg ICAgICAgb3B0aW9ucy5iaW5hcnlfbG9jYXRpb24gPSBiaW5hcnlfcGF0aAorICAgICAgICBzZXRf YmluYXJ5X2xvY2F0aW9uX2ltcGwob3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoLCBzZWxmLmFw cF9uYW1lLCBzZWxmLnByb2Nlc3NfbmFtZSkKIAogCi1jbGFzcyBPU1hDaHJvbWVDYW5hcnlEcml2 ZXIoT1NYQnJvd3NlckRyaXZlcik6CitjbGFzcyBPU1hDaHJvbWVDYW5hcnlEcml2ZXIoT1NYQ2hy b21lRHJpdmVyQmFzZSk6CiAgICAgcHJvY2Vzc19uYW1lID0gJ0dvb2dsZSBDaHJvbWUgQ2FuYXJ5 JwogICAgIGJyb3dzZXJfbmFtZSA9ICdjaHJvbWUtY2FuYXJ5JwogICAgIGFwcF9uYW1lID0gJ0dv b2dsZSBDaHJvbWUgQ2FuYXJ5LmFwcCcKICAgICBidW5kbGVfaWQgPSAnY29tLmdvb2dsZS5DaHJv bWUuY2FuYXJ5JwogCiAgICAgZGVmIF9zZXRfY2hyb21lX2JpbmFyeV9sb2NhdGlvbihzZWxmLCBv cHRpb25zLCBicm93c2VyX2J1aWxkX3BhdGgpOgotICAgICAgICBpZiBub3QgYnJvd3Nlcl9idWls ZF9wYXRoOgotICAgICAgICAgICAgYnJvd3Nlcl9idWlsZF9wYXRoID0gJy9BcHBsaWNhdGlvbnMv JwotICAgICAgICBhcHBfcGF0aCA9IG9zLnBhdGguam9pbihicm93c2VyX2J1aWxkX3BhdGgsIHNl bGYuYXBwX25hbWUpCi0gICAgICAgIGJpbmFyeV9wYXRoID0gb3MucGF0aC5qb2luKGFwcF9wYXRo LCAiQ29udGVudHMvTWFjT1MiLCBzZWxmLnByb2Nlc3NfbmFtZSkKLSAgICAgICAgb3B0aW9ucy5i aW5hcnlfbG9jYXRpb24gPSBiaW5hcnlfcGF0aAorICAgICAgICBzZXRfYmluYXJ5X2xvY2F0aW9u X2ltcGwob3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoLCBzZWxmLmFwcF9uYW1lLCBzZWxmLnBy b2Nlc3NfbmFtZSkKKworCitjbGFzcyBPU1hDaHJvbWVCZXRhRHJpdmVyKE9TWENocm9tZURyaXZl ckJhc2UpOgorICAgIHByb2Nlc3NfbmFtZSA9ICdHb29nbGUgQ2hyb21lIEJldGEnCisgICAgYnJv d3Nlcl9uYW1lID0gJ2Nocm9tZS1iZXRhJworICAgIGFwcF9uYW1lID0gJ0dvb2dsZSBDaHJvbWUg QmV0YS5hcHAnCisgICAgYnVuZGxlX2lkID0gJ2NvbS5nb29nbGUuQ2hyb21lLmJldGEnCisKKyAg ICBkZWYgX3NldF9jaHJvbWVfYmluYXJ5X2xvY2F0aW9uKHNlbGYsIG9wdGlvbnMsIGJyb3dzZXJf YnVpbGRfcGF0aCk6CisgICAgICAgIHNldF9iaW5hcnlfbG9jYXRpb25faW1wbChvcHRpb25zLCBi cm93c2VyX2J1aWxkX3BhdGgsIHNlbGYuYXBwX25hbWUsIHNlbGYucHJvY2Vzc19uYW1lKQorCitj bGFzcyBPU1hDaHJvbWVEZXZEcml2ZXIoT1NYQ2hyb21lRHJpdmVyQmFzZSk6CisgICAgcHJvY2Vz c19uYW1lID0gJ0dvb2dsZSBDaHJvbWUgRGV2JworICAgIGJyb3dzZXJfbmFtZSA9ICdjaHJvbWUt ZGV2JworICAgIGFwcF9uYW1lID0gJ0dvb2dsZSBDaHJvbWUgRGV2LmFwcCcKKyAgICBidW5kbGVf aWQgPSAnY29tLmdvb2dsZS5DaHJvbWUuZGV2JworCisgICAgZGVmIF9zZXRfY2hyb21lX2JpbmFy eV9sb2NhdGlvbihzZWxmLCBvcHRpb25zLCBicm93c2VyX2J1aWxkX3BhdGgpOgorICAgICAgICBz ZXRfYmluYXJ5X2xvY2F0aW9uX2ltcGwob3B0aW9ucywgYnJvd3Nlcl9idWlsZF9wYXRoLCBzZWxm LmFwcF9uYW1lLCBzZWxmLnByb2Nlc3NfbmFtZSkK