145582 2015-06-02 17:50:10 -0700 streamline benchmark-runner browser 2015-06-05 02:53:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 144842 1 slewis webkit-unassigned commit-queue dewei_zhu glenn rniwa slewis oldest_to_newest 1098989 0 254127 slewis 2015-06-02 17:50:10 -0700 Created attachment 254127 patch Some minor changes to benchmark-runner browser. Add Caffeinated Don't block on getting output. Use system safari as default. Add xpc dyld path. 1098991 1 commit-queue 2015-06-02 17:53:09 -0700 Attachment 254127 did not pass style-queue: ERROR: Tools/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1098997 2 254127 rniwa 2015-06-02 18:06:11 -0700 Comment on attachment 254127 patch View in context: https://bugs.webkit.org/attachment.cgi?id=254127&action=review > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:32 > + process = subprocess.Popen(['open', '-a', appPath] + args) > + cls.launchCaffeinateForProcess(process.pid) Instead of having a helper function to launch caffinate, why don't we add a method e.g. launchProcessWithCaffinate that launches both the target process and caffeinate? > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:43 > + subprocess.Popen(["/usr/bin/caffeinate", "-disw", str(pid)]) Does caffeinate automatically terminate? > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:39 > + self.safariProcess = subprocess.Popen(args, env=env) > + > + OSXSafariDriver.launchCaffeinateForProcess(self.safariProcess.pid) That way, we can just call that function instead of Popen'ing and calling a separate helper function. 1099000 3 slewis 2015-06-02 18:08:38 -0700 (In reply to comment #2) > Comment on attachment 254127 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=254127&action=review > > > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:32 > > + process = subprocess.Popen(['open', '-a', appPath] + args) > > + cls.launchCaffeinateForProcess(process.pid) > > Instead of having a helper function to launch caffinate, why don't we add a > method e.g. launchProcessWithCaffinate that launches both the target process > and caffeinate? > > > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:43 > > + subprocess.Popen(["/usr/bin/caffeinate", "-disw", str(pid)]) > > Does caffeinate automatically terminate? Yeah Caffeinate takes the pid of a process to watch and terminates when the process terminates. > > > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:39 > > + self.safariProcess = subprocess.Popen(args, env=env) > > + > > + OSXSafariDriver.launchCaffeinateForProcess(self.safariProcess.pid) > > That way, we can just call that function instead of Popen'ing and calling a > separate helper function. 1099784 4 slewis 2015-06-05 02:53:03 -0700 Committed http://trac.webkit.org/changeset/185242 254127 2015-06-02 17:50:10 -0700 2015-06-02 18:06:11 -0700 patch 0001-Streamline-run-benchmark-browser.patch text/plain 5890 slewis RnJvbSA2Zjk0YzhlNzNjYTM3OGRlZTAyN2JlNDdlZjlkM2UzNmQ0NDQzZTQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVwaGFuaWUgTGV3aXMgPHNsZXdpc0BhcHBsZS5jb20+CkRh dGU6IFR1ZSwgMiBKdW4gMjAxNSAxNzozMDo0MCAtMDcwMApTdWJqZWN0OiBbUEFUQ0ggMS8zXSBT dHJlYW1saW5lIHJ1bi1iZW5jaG1hcmsgYnJvd3NlcgoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCgpBZGQgQ2FmZmVpbmF0ZSBzbyBjb21wdXRlciB3b24ndCBzbGVlcCB3aGlsZSBydW5uaW5n LgpSZW1vdmUgY2FsbHMgdG8gY29sbGVjdCBvdXRwdXQgc2luY2Ugd2Ugd2VyZSBqdXN0IGR1bXBp bmcgdG8gc3Rkb3V0IGFueXdheS4KQWRkIHhwYyBkeWxkX3BhdGguCkRlZmF1bHQgdG8gc3lzdGVt IHNhZmFyaS4KCiogU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJp dmVyL29zeF9icm93c2VyX2RyaXZlci5weToKKE9TWEJyb3dzZXJEcml2ZXIubGF1bmNoUHJvY2Vz cyk6CihPU1hCcm93c2VyRHJpdmVyLnRlcm1pbmF0ZVByb2Nlc3Nlcyk6CihPU1hCcm93c2VyRHJp dmVyKToKKE9TWEJyb3dzZXJEcml2ZXIubGF1bmNoQ2FmZmVpbmF0ZUZvclByb2Nlc3MpOgoqIFNj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJp X2RyaXZlci5weToKKE9TWFNhZmFyaURyaXZlci5sYXVuY2hVcmwpOgooT1NYU2FmYXJpRHJpdmVy LmNsb3NlQnJvd3NlcnMpOgotLS0KIFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgfCAyMCArKysrKysrKysrKysrKysrKysrKwogLi4uL2Jyb3dzZXJf ZHJpdmVyL29zeF9icm93c2VyX2RyaXZlci5weSAgICAgICAgICAgICB8ICA3ICsrKysrKy0KIC4u Li9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJpX2RyaXZlci5weSAgICAgICAgICAgICAgfCAxNCAr KysrKysrKy0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCAzNCBpbnNlcnRpb25zKCspLCA3IGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCAyOGNlYmRmLi5kYjU5ODFjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTUtMDYtMDIgIFN0ZXBoYW5pZSBM ZXdpcyAgPHNsZXdpc0BhcHBsZS5jb20+CisKKyAgICAgICAgU3RyZWFtbGluZSBydW4tYmVuY2ht YXJrIGJyb3dzZXIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgQ2FmZmVpbmF0ZSBzbyBjb21wdXRlciB3b24ndCBzbGVlcCB3aGlsZSBydW5uaW5n LgorICAgICAgICBSZW1vdmUgY2FsbHMgdG8gY29sbGVjdCBvdXRwdXQgc2luY2Ugd2Ugd2VyZSBq dXN0IGR1bXBpbmcgdG8gc3Rkb3V0IGFueXdheS4KKyAgICAgICAgQWRkIHhwYyBkeWxkX3BhdGgu CisgICAgICAgIERlZmF1bHQgdG8gc3lzdGVtIHNhZmFyaS4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfYnJvd3Nlcl9kcml2 ZXIucHk6CisgICAgICAgIChPU1hCcm93c2VyRHJpdmVyLmxhdW5jaFByb2Nlc3MpOgorICAgICAg ICAoT1NYQnJvd3NlckRyaXZlci50ZXJtaW5hdGVQcm9jZXNzZXMpOgorICAgICAgICAoT1NYQnJv d3NlckRyaXZlcik6CisgICAgICAgIChPU1hCcm93c2VyRHJpdmVyLmxhdW5jaENhZmZlaW5hdGVG b3JQcm9jZXNzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIv YnJvd3Nlcl9kcml2ZXIvb3N4X3NhZmFyaV9kcml2ZXIucHk6CisgICAgICAgIChPU1hTYWZhcmlE cml2ZXIubGF1bmNoVXJsKToKKyAgICAgICAgKE9TWFNhZmFyaURyaXZlci5jbG9zZUJyb3dzZXJz KToKKwogMjAxNS0wNS0yNiAgRGFuYSBCdXJrYXJ0ICA8ZGJ1cmthcnRAYXBwbGUuY29tPgogCiAg ICAgICAgIEZpeGVzIGNvbXBhdGliaWxpdHkgaXNzdWVzIHdpdGggcmVjZW50IGRhc2hib2FyZCBj bGVhbnVwLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVu bmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9icm93c2VyX2RyaXZlci5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfYnJvd3Nlcl9kcml2 ZXIucHkKaW5kZXggOTA2ZjFiMy4uYTFlZTk5MCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9icm93c2VyX2RyaXZl ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nl cl9kcml2ZXIvb3N4X2Jyb3dzZXJfZHJpdmVyLnB5CkBAIC0yOCw3ICsyOCw4IEBAIGNsYXNzIE9T WEJyb3dzZXJEcml2ZXIoQnJvd3NlckRyaXZlcik6CiAgICAgICAgIF9sb2cuaW5mbygnTGF1bmNo aW5nICIlcyIgd2l0aCB1cmwgIiVzIicgJSAoYXBwUGF0aCwgdXJsKSkKIAogICAgICAgICAjIEZJ WE1FOiBNYXkgbmVlZCB0byBiZSBtb2RpZmllZCBmb3IgYSBsb2NhbCBidWlsZCBzdWNoIGFzIHNl dHRpbmcgdXAgRFlMRCBsaWJyYXJpZXMKLSAgICAgICAgc3VicHJvY2Vzcy5Qb3BlbigoWydvcGVu JywgJy1hJywgYXBwUGF0aF0gKyBhcmdzKSkuY29tbXVuaWNhdGUoKQorICAgICAgICBwcm9jZXNz ID0gc3VicHJvY2Vzcy5Qb3BlbihbJ29wZW4nLCAnLWEnLCBhcHBQYXRoXSArIGFyZ3MpCisgICAg ICAgIGNscy5sYXVuY2hDYWZmZWluYXRlRm9yUHJvY2Vzcyhwcm9jZXNzLnBpZCkKIAogICAgIEBj bGFzc21ldGhvZAogICAgIGRlZiB0ZXJtaW5hdGVQcm9jZXNzZXMoY2xzLCBidW5kbGVJZGVudGlm aWVyKToKQEAgLTM2LDMgKzM3LDcgQEAgY2xhc3MgT1NYQnJvd3NlckRyaXZlcihCcm93c2VyRHJp dmVyKToKICAgICAgICAgcHJvY2Vzc2VzID0gTlNSdW5uaW5nQXBwbGljYXRpb24ucnVubmluZ0Fw cGxpY2F0aW9uc1dpdGhCdW5kbGVJZGVudGlmaWVyXyhidW5kbGVJZGVudGlmaWVyKQogICAgICAg ICBmb3IgcHJvY2VzcyBpbiBwcm9jZXNzZXM6CiAgICAgICAgICAgICBwcm9jZXNzLnRlcm1pbmF0 ZSgpCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgbGF1bmNoQ2FmZmVpbmF0ZUZvclByb2Nl c3MoY2xzLCBwaWQpOgorICAgICAgICBzdWJwcm9jZXNzLlBvcGVuKFsiL3Vzci9iaW4vY2FmZmVp bmF0ZSIsICItZGlzdyIsIHN0cihwaWQpXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJpX2RyaXZlci5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZl ci9vc3hfc2FmYXJpX2RyaXZlci5weQppbmRleCA3M2QyMDZkLi43ZTQ2NzYyIDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIv b3N4X3NhZmFyaV9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1h cmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9zYWZhcmlfZHJpdmVyLnB5CkBAIC0yMiwyNyAr MjIsMjkgQEAgY2xhc3MgT1NYU2FmYXJpRHJpdmVyKE9TWEJyb3dzZXJEcml2ZXIpOgogICAgICAg ICBzZWxmLnNhZmFyaVByZWZlcmVuY2VzID0gWyItSG9tZVBhZ2UiLCAiYWJvdXQ6YmxhbmsiLCAi LVdhcm5BYm91dEZyYXVkdWxlbnRXZWJzaXRlcyIsICIwIiwgIi1FeHRlbnNpb25zRW5hYmxlZCIs ICIwIiwgIi1TaG93U3RhdHVzQmFyIiwgIjAiLCAiLU5ld1dpbmRvd0JlaGF2aW9yIiwgIjEiLCAi LU5ld1RhYkJlaGF2aW9yIiwgIjEiXQogCiAgICAgZGVmIGxhdW5jaFVybChzZWxmLCB1cmwsIGJy b3dzZXJCdWlsZFBhdGgpOgotICAgICAgICBhcmdzID0gWycvQXBwbGljYXRpb25zL1NhZmFyaS5h cHAvQ29udGVudHMvTWFjT1MvU2FmYXJpRm9yV2ViS2l0RGV2ZWxvcG1lbnQnXQorICAgICAgICBh cmdzID0gWycvQXBwbGljYXRpb25zL1NhZmFyaS5hcHAvQ29udGVudHMvTWFjT1MvU2FmYXJpJ10K ICAgICAgICAgZW52ID0ge30KICAgICAgICAgaWYgYnJvd3NlckJ1aWxkUGF0aDoKICAgICAgICAg ICAgIHNhZmFyaUFwcEluQnVpbGRQYXRoID0gb3MucGF0aC5qb2luKGJyb3dzZXJCdWlsZFBhdGgs ICdTYWZhcmkuYXBwL0NvbnRlbnRzL01hY09TL1NhZmFyaScpCiAgICAgICAgICAgICBpZiBvcy5w YXRoLmV4aXN0cyhzYWZhcmlBcHBJbkJ1aWxkUGF0aCk6CiAgICAgICAgICAgICAgICAgYXJncyA9 IFtzYWZhcmlBcHBJbkJ1aWxkUGF0aF0KLSAgICAgICAgICAgICAgICBlbnYgPSB7J0RZTERfRlJB TUVXT1JLX1BBVEgnOiBicm93c2VyQnVpbGRQYXRoLCAnRFlMRF9MSUJSQVJZX1BBVEgnOiBicm93 c2VyQnVpbGRQYXRofQorICAgICAgICAgICAgICAgIGVudiA9IHsnRFlMRF9GUkFNRVdPUktfUEFU SCc6IGJyb3dzZXJCdWlsZFBhdGgsICdEWUxEX0xJQlJBUllfUEFUSCc6IGJyb3dzZXJCdWlsZFBh dGgsICdfX1hQQ19EWUxEX0xJQlJBUllfUEFUSCc6IGJyb3dzZXJCdWlsZFBhdGh9CiAgICAgICAg ICAgICBlbHNlOgotICAgICAgICAgICAgICAgIF9sb2cuaW5mbygnQ291bGQgbm90IGZpbmQgU2Fm YXJpLmFwcCBhdCAlcywgdXNpbmcgdGhlIHN5c3RlbSBTYWZhcmlGb3JXZWJLaXREZXZlbG9wbWVu dCBpbiAvQXBwbGljYXRpb25zIGluc3RlYWQnICUgc2FmYXJpQXBwSW5CdWlsZFBhdGgpCisgICAg ICAgICAgICAgICAgX2xvZy5pbmZvKCdDb3VsZCBub3QgZmluZCBTYWZhcmkuYXBwIGF0ICVzLCB1 c2luZyB0aGUgc3lzdGVtIFNhZmFyaSBpbnN0ZWFkJyAlIHNhZmFyaUFwcEluQnVpbGRQYXRoKQog CiAgICAgICAgIGFyZ3MuZXh0ZW5kKHNlbGYuc2FmYXJpUHJlZmVyZW5jZXMpCiAgICAgICAgIF9s b2cuaW5mbygnTGF1bmNoaW5nIHNhZmFyaTogJXMgd2l0aCB1cmw6ICVzJyAlIChhcmdzWzBdLCB1 cmwpKQotICAgICAgICBzZWxmLnNhZmFyaVByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGFyZ3Ms IGVudj1lbnYsIHN0ZGluPXN1YnByb2Nlc3MuUElQRSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSwg c3RkZXJyPXN1YnByb2Nlc3MuUElQRSkKKyAgICAgICAgc2VsZi5zYWZhcmlQcm9jZXNzID0gc3Vi cHJvY2Vzcy5Qb3BlbihhcmdzLCBlbnY9ZW52KQorCisgICAgICAgIE9TWFNhZmFyaURyaXZlci5s YXVuY2hDYWZmZWluYXRlRm9yUHJvY2VzcyhzZWxmLnNhZmFyaVByb2Nlc3MucGlkKQorCiAgICAg ICAgICMgU3RvcCBmb3IgaW5pdGlhbGl6YXRpb24gb2YgdGhlIHNhZmFyaSBwcm9jZXNzLCBvdGhl cndpc2UsIG9wZW4KICAgICAgICAgIyBjb21tYW5kIG1heSB1c2UgdGhlIHN5c3RlbSBzYWZhcmku CiAgICAgICAgIHRpbWUuc2xlZXAoMykKICAgICAgICAgc3VicHJvY2Vzcy5Qb3BlbihbJ29wZW4n LCB1cmxdKQogCiAgICAgZGVmIGNsb3NlQnJvd3NlcnMoc2VsZik6Ci0gICAgICAgIHNlbGYudGVy bWluYXRlUHJvY2Vzc2VzKCdjb20uYXBwbGUuU2FmYXJpJykKICAgICAgICAgaWYgc2VsZi5zYWZh cmlQcm9jZXNzOgotICAgICAgICAgICAgX2xvZy5pbmZvKCdTYWZhcmkgcHJvY2VzcyBjb25zb2xl IG91dHB1dDpcbnN0ZG91dDogJXNcbnN0ZGVycjogJXMnICUgc2VsZi5zYWZhcmlQcm9jZXNzLmNv bW11bmljYXRlKCkpCisgICAgICAgICAgICBzZWxmLnRlcm1pbmF0ZVByb2Nlc3NlcygnY29tLmFw cGxlLlNhZmFyaScpCiAgICAgICAgICAgICBpZiBzZWxmLnNhZmFyaVByb2Nlc3MucmV0dXJuY29k ZToKICAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCdTYWZhcmkgQ3Jhc2hlZCEnKQotLSAKMi4z LjQgKEFwcGxlIEdpdC01NikKCg==