144436 2015-04-29 22:34:43 -0700 Fix return code issue, check return code of safari process and dump results to log 2015-04-30 00:09:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned commit-queue dewei_zhu glenn rniwa oldest_to_newest 1090360 0 dewei_zhu 2015-04-29 22:34:43 -0700 Fix return code issue, check return code of safari process and dump results to log 1090361 1 252040 dewei_zhu 2015-04-29 22:41:13 -0700 Created attachment 252040 Patch 1090362 2 252040 rniwa 2015-04-29 22:43:11 -0700 Comment on attachment 252040 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252040&action=review > Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:42 > + _log.info('Safari process console output:\n\tstdout: %s\n\tstderr: %s' % self.safariProcess.communicate()) since stdout and stderr will contain multiple lines, I don't think it makes sense to indent by \t. Also, you might wanna add \n after : 1090363 3 252041 dewei_zhu 2015-04-29 22:48:05 -0700 Created attachment 252041 Patch 1090366 4 252042 dewei_zhu 2015-04-29 23:18:11 -0700 Created attachment 252042 Patch 1090378 5 252042 commit-queue 2015-04-30 00:09:34 -0700 Comment on attachment 252042 Patch Clearing flags on attachment: 252042 Committed r183621: <http://trac.webkit.org/changeset/183621> 1090379 6 commit-queue 2015-04-30 00:09:39 -0700 All reviewed patches have been landed. Closing bug. 252040 2015-04-29 22:41:13 -0700 2015-04-29 22:48:01 -0700 Patch bug-144436-20150429224003.patch text/plain 5123 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGViYWYxYjA5MjU1NWJhMDVmZWU3NjEzZjczZmZkMjg0 MmFkNTVlMy4uMzY5NjNmMWFkMDAzOTUyOThkMTUzNjlkZGNiMGIzNzcxNzA5OTUyYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDE1LTA0LTI5ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEZpeCByZXR1cm4gY29kZSBpc3N1ZSwgY2hlY2sgcmV0dXJuIGNvZGUgb2Ygc2FmYXJpIHBy b2Nlc3MgYW5kIGR1bXAgcmVzdWx0cyB0byBsb2cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDQzNgorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1 a2UgTml3YS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWJlbmNobWFyazoKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAg ICAgICAgKEJlbmNobWFya1J1bm5lci5kdW1wKTogQ29ycmVjdCB0eXBvLgorICAgICAgICAoQmVu Y2htYXJrUnVubmVyLndyYXApOiBBZGQgcmVzdWx0cyB0byBjb25zb2xlLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJp X2RyaXZlci5weTogQ2hlY2sgcmV0dXJuIGNvZGUgdG8gZGV0ZWN0IFNhZmFyaSBjcmFzaGVzLgor ICAgICAgICAoT1NYU2FmYXJpRHJpdmVyLnByZXBhcmVFbnYpOgorICAgICAgICAoT1NYU2FmYXJp RHJpdmVyLmxhdW5jaFVybCk6CisgICAgICAgIChPU1hTYWZhcmlEcml2ZXIuY2xvc2VCcm93c2Vy cyk6CisKIDIwMTUtMDQtMjkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAK ICAgICAgICAgZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUt ZXZlbnQtY291bnQuaHRtbCB0aW1lcyBvdXQgb24gWW9zZW1pdGUgV0syCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsgYi9Ub29scy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsK aW5kZXggM2IwNjI5YWExMjg5ZTMwNmY3ZTBhZTNmZTI2NmYyYjY3ZDZiNjA3Mi4uMzA0ODBmODM2 OTU2MGNlNDliN2VkYWQxMWY2YTIwZTExYmJhMzZlNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9ydW4tYmVuY2htYXJrCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWJlbmNobWFyawpAQCAtMiw2 ICsyLDggQEAKIAogaW1wb3J0IGFyZ3BhcnNlCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IHN5cwor CiBmcm9tIHdlYmtpdHB5LmJlbmNobWFya19ydW5uZXIuYmVuY2htYXJrX3J1bm5lciBpbXBvcnQg QmVuY2htYXJrUnVubmVyCiAKIApAQCAtMzQsNCArMzYsNCBAQCBkZWYgbWFpbigpOgogICAgIHJl dHVybiBydW5uZXIuZXhlY3V0ZSgpCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAg bWFpbigpCisgICAgc3lzLmV4aXQobWFpbigpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQppbmRleCBh OTcyOGEzNzg1OGExZDA0NGMwMDE5ZTJmODg2NTdhNzZkZjM5YzEyLi44NmUyN2ZiZDQzN2VlYTY0 ZmQyNTIxZGI0ODU1NTc3OTQyNDAzNDdjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQpAQCAtNzIs NyArNzIsNyBAQCBjbGFzcyBCZW5jaG1hcmtSdW5uZXIob2JqZWN0KToKIAogICAgIEBjbGFzc21l dGhvZAogICAgIGRlZiBkdW1wKGNscywgcmVzdWx0cywgb3V0cHV0RmlsZSk6Ci0gICAgICAgIF9s b2cuaW5mbygnRHVtcHBpbmcgdGhlIHJlc3VsdHMgdG8gZmlsZScpCisgICAgICAgIF9sb2cuaW5m bygnRHVtcGluZyB0aGUgcmVzdWx0cyB0byBmaWxlJykKICAgICAgICAgdHJ5OgogICAgICAgICAg ICAgd2l0aCBvcGVuKG91dHB1dEZpbGUsICd3JykgYXMgZnA6CiAgICAgICAgICAgICAgICAganNv bi5kdW1wKHJlc3VsdHMsIGZwKQpAQCAtODIsMTEgKzgyLDEzIEBAIGNsYXNzIEJlbmNobWFya1J1 bm5lcihvYmplY3QpOgogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIHdyYXAoY2xzLCBkaWN0 cyk6CisgICAgICAgIF9sb2cuaW5mbygnTWVyZ2luZyBmb2xsb3dpbmcgcmVzdWx0czpcbiVzJywg anNvbi5kdW1wcyhkaWN0cykpCiAgICAgICAgIGlmIG5vdCBkaWN0czoKICAgICAgICAgICAgIHJl dHVybiBOb25lCiAgICAgICAgIHJldCA9IHt9CiAgICAgICAgIGZvciBkaWMgaW4gZGljdHM6CiAg ICAgICAgICAgICByZXQgPSBjbHMubWVyZ2UocmV0LCBkaWMpCisgICAgICAgIF9sb2cuaW5mbygn UmVzdWx0cyBhZnRlciBtZXJnaW5nOlxuJXMnLCBqc29uLmR1bXBzKHJldCkpCiAgICAgICAgIHJl dHVybiByZXQKIAogICAgIEBjbGFzc21ldGhvZApAQCAtOTYsNyArOTgsNyBAQCBjbGFzcyBCZW5j aG1hcmtSdW5uZXIob2JqZWN0KToKICAgICAgICAgIyBzcGVjaWFsIGhhbmRsZSBmb3IgbGlzdCB0 eXBlLCBhbmQgc2hvdWxkIGJlIGhhbmRsZSBiZWZvcmUgZXF1YWwgY2hlY2sKICAgICAgICAgaWYg YXJnVHlwZSA9PSB0eXBlcy5MaXN0VHlwZToKICAgICAgICAgICAgIHJldHVybiBhICsgYgotICAg ICAgICBpZiBhID09IGI6CisgICAgICAgIGlmIGEgPT0gYiBhbmQgJ21ldHJpY3MnIGluIGE6CiAg ICAgICAgICAgICByZXR1cm4gYQogICAgICAgICBpZiBhcmdUeXBlID09IHR5cGVzLkRpY3RUeXBl OgogICAgICAgICAgICAgcmVzdWx0ID0ge30KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJpX2RyaXZlci5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZl ci9vc3hfc2FmYXJpX2RyaXZlci5weQppbmRleCBhNjM2NTJiNmY1Mzk3NzM0MjQwNDVkMjUyMjI3 Njg2ZTEzMTgzOWNkLi45ZjRiNzY2NTNjN2U5YmJmMTUyYjY3OTRmYzQwOWVlZGZmNjg3ZGYwIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nl cl9kcml2ZXIvb3N4X3NhZmFyaV9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9zYWZhcmlfZHJpdmVyLnB5CkBA IC0xNyw2ICsxNyw3IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIGNsYXNz IE9TWFNhZmFyaURyaXZlcihCcm93c2VyRHJpdmVyKToKIAogICAgIGRlZiBwcmVwYXJlRW52KHNl bGYpOgorICAgICAgICBzZWxmLnNhZmFyaVByb2Nlc3MgPSBOb25lCiAgICAgICAgIHNlbGYuY2xv c2VCcm93c2VycygpCiAgICAgICAgIGZvcmNlUmVtb3ZlKG9zLnBhdGguam9pbihvcy5wYXRoLmV4 cGFuZHVzZXIoJ34nKSwgJ0xpYnJhcnkvU2F2ZWQgQXBwbGljYXRpb24gU3RhdGUvY29tLmFwcGxl LlNhZmFyaS5zYXZlZFN0YXRlJykpCiAgICAgICAgIGZvcmNlUmVtb3ZlKG9zLnBhdGguam9pbihv cy5wYXRoLmV4cGFuZHVzZXIoJ34nKSwgJ0xpYnJhcnkvU2FmYXJpL0xhc3RTZXNzaW9uLnBsaXN0 JykpCkBAIC0yNiw3ICsyNyw3IEBAIGNsYXNzIE9TWFNhZmFyaURyaXZlcihCcm93c2VyRHJpdmVy KToKICAgICAgICAgYXJncyA9IFtvcy5wYXRoLmpvaW4oYnJvd3NlckJ1aWxkUGF0aCwgJ1NhZmFy aS5hcHAvQ29udGVudHMvTWFjT1MvU2FmYXJpJyldCiAgICAgICAgIGFyZ3MuZXh0ZW5kKHNlbGYu c2FmYXJpUHJlZmVyZW5jZXMpCiAgICAgICAgIF9sb2cuaW5mbygnTGF1bmNoaW5nIHNhZmFyaTog JXMgd2l0aCB1cmw6ICVzJyAlIChhcmdzWzBdLCB1cmwpKQotICAgICAgICBzdWJwcm9jZXNzLlBv cGVuKGFyZ3MsIGVudj17J0RZTERfRlJBTUVXT1JLX1BBVEgnOiBicm93c2VyQnVpbGRQYXRoLCAn RFlMRF9MSUJSQVJZX1BBVEgnOiBicm93c2VyQnVpbGRQYXRofSwgc3RkaW49c3VicHJvY2Vzcy5Q SVBFLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQorICAg ICAgICBzZWxmLnNhZmFyaVByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGFyZ3MsIGVudj17J0RZ TERfRlJBTUVXT1JLX1BBVEgnOiBicm93c2VyQnVpbGRQYXRoLCAnRFlMRF9MSUJSQVJZX1BBVEgn OiBicm93c2VyQnVpbGRQYXRofSwgc3RkaW49c3VicHJvY2Vzcy5QSVBFLCBzdGRvdXQ9c3VicHJv Y2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQogICAgICAgICAjIFN0b3AgZm9yIGlu aXRpYWxpemF0aW9uIG9mIHRoZSBzYWZhcmkgcHJvY2Vzcywgb3RoZXJ3aXNlLCBvcGVuCiAgICAg ICAgICMgY29tbWFuZCBtYXkgdXNlIHRoZSBzeXN0ZW0gc2FmYXJpLgogICAgICAgICB0aW1lLnNs ZWVwKDMpCkBAIC0zNywzICszOCw3IEBAIGNsYXNzIE9TWFNhZmFyaURyaXZlcihCcm93c2VyRHJp dmVyKToKICAgICAgICAgc2FmYXJpSW5zdGFuY2VzID0gTlNSdW5uaW5nQXBwbGljYXRpb24ucnVu bmluZ0FwcGxpY2F0aW9uc1dpdGhCdW5kbGVJZGVudGlmaWVyXygnY29tLmFwcGxlLlNhZmFyaScp CiAgICAgICAgIGZvciBzYWZhcmlJbnN0YW5jZSBpbiBzYWZhcmlJbnN0YW5jZXM6CiAgICAgICAg ICAgICBzYWZhcmlJbnN0YW5jZS50ZXJtaW5hdGUoKQorICAgICAgICBpZiBzZWxmLnNhZmFyaVBy b2Nlc3M6CisgICAgICAgICAgICBfbG9nLmluZm8oJ1NhZmFyaSBwcm9jZXNzIGNvbnNvbGUgb3V0 cHV0OlxuXHRzdGRvdXQ6ICVzXG5cdHN0ZGVycjogJXMnICUgc2VsZi5zYWZhcmlQcm9jZXNzLmNv bW11bmljYXRlKCkpCisgICAgICAgICAgICBpZiBzZWxmLnNhZmFyaVByb2Nlc3MucmV0dXJuY29k ZToKKyAgICAgICAgICAgICAgICBfbG9nLmVycm9yKCdTYWZhcmkgQ3Jhc2hlZCEnKQo= 252041 2015-04-29 22:48:05 -0700 2015-04-29 23:18:06 -0700 Patch bug-144436-20150429224655.patch text/plain 5119 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGViYWYxYjA5MjU1NWJhMDVmZWU3NjEzZjczZmZkMjg0 MmFkNTVlMy4uMzY5NjNmMWFkMDAzOTUyOThkMTUzNjlkZGNiMGIzNzcxNzA5OTUyYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDE1LTA0LTI5ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEZpeCByZXR1cm4gY29kZSBpc3N1ZSwgY2hlY2sgcmV0dXJuIGNvZGUgb2Ygc2FmYXJpIHBy b2Nlc3MgYW5kIGR1bXAgcmVzdWx0cyB0byBsb2cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDQzNgorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1 a2UgTml3YS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWJlbmNobWFyazoKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAg ICAgICAgKEJlbmNobWFya1J1bm5lci5kdW1wKTogQ29ycmVjdCB0eXBvLgorICAgICAgICAoQmVu Y2htYXJrUnVubmVyLndyYXApOiBBZGQgcmVzdWx0cyB0byBjb25zb2xlLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJp X2RyaXZlci5weTogQ2hlY2sgcmV0dXJuIGNvZGUgdG8gZGV0ZWN0IFNhZmFyaSBjcmFzaGVzLgor ICAgICAgICAoT1NYU2FmYXJpRHJpdmVyLnByZXBhcmVFbnYpOgorICAgICAgICAoT1NYU2FmYXJp RHJpdmVyLmxhdW5jaFVybCk6CisgICAgICAgIChPU1hTYWZhcmlEcml2ZXIuY2xvc2VCcm93c2Vy cyk6CisKIDIwMTUtMDQtMjkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAK ICAgICAgICAgZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUt ZXZlbnQtY291bnQuaHRtbCB0aW1lcyBvdXQgb24gWW9zZW1pdGUgV0syCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsgYi9Ub29scy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsK aW5kZXggM2IwNjI5YWExMjg5ZTMwNmY3ZTBhZTNmZTI2NmYyYjY3ZDZiNjA3Mi4uMzA0ODBmODM2 OTU2MGNlNDliN2VkYWQxMWY2YTIwZTExYmJhMzZlNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9ydW4tYmVuY2htYXJrCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWJlbmNobWFyawpAQCAtMiw2 ICsyLDggQEAKIAogaW1wb3J0IGFyZ3BhcnNlCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IHN5cwor CiBmcm9tIHdlYmtpdHB5LmJlbmNobWFya19ydW5uZXIuYmVuY2htYXJrX3J1bm5lciBpbXBvcnQg QmVuY2htYXJrUnVubmVyCiAKIApAQCAtMzQsNCArMzYsNCBAQCBkZWYgbWFpbigpOgogICAgIHJl dHVybiBydW5uZXIuZXhlY3V0ZSgpCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAg bWFpbigpCisgICAgc3lzLmV4aXQobWFpbigpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQppbmRleCBh OTcyOGEzNzg1OGExZDA0NGMwMDE5ZTJmODg2NTdhNzZkZjM5YzEyLi44NmUyN2ZiZDQzN2VlYTY0 ZmQyNTIxZGI0ODU1NTc3OTQyNDAzNDdjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQpAQCAtNzIs NyArNzIsNyBAQCBjbGFzcyBCZW5jaG1hcmtSdW5uZXIob2JqZWN0KToKIAogICAgIEBjbGFzc21l dGhvZAogICAgIGRlZiBkdW1wKGNscywgcmVzdWx0cywgb3V0cHV0RmlsZSk6Ci0gICAgICAgIF9s b2cuaW5mbygnRHVtcHBpbmcgdGhlIHJlc3VsdHMgdG8gZmlsZScpCisgICAgICAgIF9sb2cuaW5m bygnRHVtcGluZyB0aGUgcmVzdWx0cyB0byBmaWxlJykKICAgICAgICAgdHJ5OgogICAgICAgICAg ICAgd2l0aCBvcGVuKG91dHB1dEZpbGUsICd3JykgYXMgZnA6CiAgICAgICAgICAgICAgICAganNv bi5kdW1wKHJlc3VsdHMsIGZwKQpAQCAtODIsMTEgKzgyLDEzIEBAIGNsYXNzIEJlbmNobWFya1J1 bm5lcihvYmplY3QpOgogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIHdyYXAoY2xzLCBkaWN0 cyk6CisgICAgICAgIF9sb2cuaW5mbygnTWVyZ2luZyBmb2xsb3dpbmcgcmVzdWx0czpcbiVzJywg anNvbi5kdW1wcyhkaWN0cykpCiAgICAgICAgIGlmIG5vdCBkaWN0czoKICAgICAgICAgICAgIHJl dHVybiBOb25lCiAgICAgICAgIHJldCA9IHt9CiAgICAgICAgIGZvciBkaWMgaW4gZGljdHM6CiAg ICAgICAgICAgICByZXQgPSBjbHMubWVyZ2UocmV0LCBkaWMpCisgICAgICAgIF9sb2cuaW5mbygn UmVzdWx0cyBhZnRlciBtZXJnaW5nOlxuJXMnLCBqc29uLmR1bXBzKHJldCkpCiAgICAgICAgIHJl dHVybiByZXQKIAogICAgIEBjbGFzc21ldGhvZApAQCAtOTYsNyArOTgsNyBAQCBjbGFzcyBCZW5j aG1hcmtSdW5uZXIob2JqZWN0KToKICAgICAgICAgIyBzcGVjaWFsIGhhbmRsZSBmb3IgbGlzdCB0 eXBlLCBhbmQgc2hvdWxkIGJlIGhhbmRsZSBiZWZvcmUgZXF1YWwgY2hlY2sKICAgICAgICAgaWYg YXJnVHlwZSA9PSB0eXBlcy5MaXN0VHlwZToKICAgICAgICAgICAgIHJldHVybiBhICsgYgotICAg ICAgICBpZiBhID09IGI6CisgICAgICAgIGlmIGEgPT0gYiBhbmQgJ21ldHJpY3MnIGluIGE6CiAg ICAgICAgICAgICByZXR1cm4gYQogICAgICAgICBpZiBhcmdUeXBlID09IHR5cGVzLkRpY3RUeXBl OgogICAgICAgICAgICAgcmVzdWx0ID0ge30KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJpX2RyaXZlci5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZl ci9vc3hfc2FmYXJpX2RyaXZlci5weQppbmRleCBhNjM2NTJiNmY1Mzk3NzM0MjQwNDVkMjUyMjI3 Njg2ZTEzMTgzOWNkLi5mZGI5MDZiNGNlN2EwMGIwZjZhMTA4MmZmMWVlM2E2OTA5NjA1M2I4IDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nl cl9kcml2ZXIvb3N4X3NhZmFyaV9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9zYWZhcmlfZHJpdmVyLnB5CkBA IC0xNyw2ICsxNyw3IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIGNsYXNz IE9TWFNhZmFyaURyaXZlcihCcm93c2VyRHJpdmVyKToKIAogICAgIGRlZiBwcmVwYXJlRW52KHNl bGYpOgorICAgICAgICBzZWxmLnNhZmFyaVByb2Nlc3MgPSBOb25lCiAgICAgICAgIHNlbGYuY2xv c2VCcm93c2VycygpCiAgICAgICAgIGZvcmNlUmVtb3ZlKG9zLnBhdGguam9pbihvcy5wYXRoLmV4 cGFuZHVzZXIoJ34nKSwgJ0xpYnJhcnkvU2F2ZWQgQXBwbGljYXRpb24gU3RhdGUvY29tLmFwcGxl LlNhZmFyaS5zYXZlZFN0YXRlJykpCiAgICAgICAgIGZvcmNlUmVtb3ZlKG9zLnBhdGguam9pbihv cy5wYXRoLmV4cGFuZHVzZXIoJ34nKSwgJ0xpYnJhcnkvU2FmYXJpL0xhc3RTZXNzaW9uLnBsaXN0 JykpCkBAIC0yNiw3ICsyNyw3IEBAIGNsYXNzIE9TWFNhZmFyaURyaXZlcihCcm93c2VyRHJpdmVy KToKICAgICAgICAgYXJncyA9IFtvcy5wYXRoLmpvaW4oYnJvd3NlckJ1aWxkUGF0aCwgJ1NhZmFy aS5hcHAvQ29udGVudHMvTWFjT1MvU2FmYXJpJyldCiAgICAgICAgIGFyZ3MuZXh0ZW5kKHNlbGYu c2FmYXJpUHJlZmVyZW5jZXMpCiAgICAgICAgIF9sb2cuaW5mbygnTGF1bmNoaW5nIHNhZmFyaTog JXMgd2l0aCB1cmw6ICVzJyAlIChhcmdzWzBdLCB1cmwpKQotICAgICAgICBzdWJwcm9jZXNzLlBv cGVuKGFyZ3MsIGVudj17J0RZTERfRlJBTUVXT1JLX1BBVEgnOiBicm93c2VyQnVpbGRQYXRoLCAn RFlMRF9MSUJSQVJZX1BBVEgnOiBicm93c2VyQnVpbGRQYXRofSwgc3RkaW49c3VicHJvY2Vzcy5Q SVBFLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQorICAg ICAgICBzZWxmLnNhZmFyaVByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKGFyZ3MsIGVudj17J0RZ TERfRlJBTUVXT1JLX1BBVEgnOiBicm93c2VyQnVpbGRQYXRoLCAnRFlMRF9MSUJSQVJZX1BBVEgn OiBicm93c2VyQnVpbGRQYXRofSwgc3RkaW49c3VicHJvY2Vzcy5QSVBFLCBzdGRvdXQ9c3VicHJv Y2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5QSVBFKQogICAgICAgICAjIFN0b3AgZm9yIGlu aXRpYWxpemF0aW9uIG9mIHRoZSBzYWZhcmkgcHJvY2Vzcywgb3RoZXJ3aXNlLCBvcGVuCiAgICAg ICAgICMgY29tbWFuZCBtYXkgdXNlIHRoZSBzeXN0ZW0gc2FmYXJpLgogICAgICAgICB0aW1lLnNs ZWVwKDMpCkBAIC0zNywzICszOCw3IEBAIGNsYXNzIE9TWFNhZmFyaURyaXZlcihCcm93c2VyRHJp dmVyKToKICAgICAgICAgc2FmYXJpSW5zdGFuY2VzID0gTlNSdW5uaW5nQXBwbGljYXRpb24ucnVu bmluZ0FwcGxpY2F0aW9uc1dpdGhCdW5kbGVJZGVudGlmaWVyXygnY29tLmFwcGxlLlNhZmFyaScp CiAgICAgICAgIGZvciBzYWZhcmlJbnN0YW5jZSBpbiBzYWZhcmlJbnN0YW5jZXM6CiAgICAgICAg ICAgICBzYWZhcmlJbnN0YW5jZS50ZXJtaW5hdGUoKQorICAgICAgICBpZiBzZWxmLnNhZmFyaVBy b2Nlc3M6CisgICAgICAgICAgICBfbG9nLmluZm8oJ1NhZmFyaSBwcm9jZXNzIGNvbnNvbGUgb3V0 cHV0Olxuc3Rkb3V0OiAlc1xuc3RkZXJyOiAlcycgJSBzZWxmLnNhZmFyaVByb2Nlc3MuY29tbXVu aWNhdGUoKSkKKyAgICAgICAgICAgIGlmIHNlbGYuc2FmYXJpUHJvY2Vzcy5yZXR1cm5jb2RlOgor ICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ1NhZmFyaSBDcmFzaGVkIScpCg== 252042 2015-04-29 23:18:11 -0700 2015-04-30 00:09:34 -0700 Patch bug-144436-20150429231701.patch text/plain 4779 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTYxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGViYWYxYjA5MjU1NWJhMDVmZWU3NjEzZjczZmZkMjg0 MmFkNTVlMy4uMzY5NjNmMWFkMDAzOTUyOThkMTUzNjlkZGNiMGIzNzcxNzA5OTUyYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDE1LTA0LTI5ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEZpeCByZXR1cm4gY29kZSBpc3N1ZSwgY2hlY2sgcmV0dXJuIGNvZGUgb2Ygc2FmYXJpIHBy b2Nlc3MgYW5kIGR1bXAgcmVzdWx0cyB0byBsb2cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDQzNgorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1 a2UgTml3YS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWJlbmNobWFyazoKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weToKKyAg ICAgICAgKEJlbmNobWFya1J1bm5lci5kdW1wKTogQ29ycmVjdCB0eXBvLgorICAgICAgICAoQmVu Y2htYXJrUnVubmVyLndyYXApOiBBZGQgcmVzdWx0cyB0byBjb25zb2xlLgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93c2VyX2RyaXZlci9vc3hfc2FmYXJp X2RyaXZlci5weTogQ2hlY2sgcmV0dXJuIGNvZGUgdG8gZGV0ZWN0IFNhZmFyaSBjcmFzaGVzLgor ICAgICAgICAoT1NYU2FmYXJpRHJpdmVyLnByZXBhcmVFbnYpOgorICAgICAgICAoT1NYU2FmYXJp RHJpdmVyLmxhdW5jaFVybCk6CisgICAgICAgIChPU1hTYWZhcmlEcml2ZXIuY2xvc2VCcm93c2Vy cyk6CisKIDIwMTUtMDQtMjkgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAK ICAgICAgICAgZmFzdC9mcmFtZXMvZmxhdHRlbmluZy9pZnJhbWUtZmxhdHRlbmluZy1yZXNpemUt ZXZlbnQtY291bnQuaHRtbCB0aW1lcyBvdXQgb24gWW9zZW1pdGUgV0syCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsgYi9Ub29scy9TY3JpcHRzL3J1bi1iZW5jaG1hcmsK aW5kZXggM2IwNjI5YWExMjg5ZTMwNmY3ZTBhZTNmZTI2NmYyYjY3ZDZiNjA3Mi4uMzA0ODBmODM2 OTU2MGNlNDliN2VkYWQxMWY2YTIwZTExYmJhMzZlNiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9ydW4tYmVuY2htYXJrCisrKyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWJlbmNobWFyawpAQCAtMiw2 ICsyLDggQEAKIAogaW1wb3J0IGFyZ3BhcnNlCiBpbXBvcnQgbG9nZ2luZworaW1wb3J0IHN5cwor CiBmcm9tIHdlYmtpdHB5LmJlbmNobWFya19ydW5uZXIuYmVuY2htYXJrX3J1bm5lciBpbXBvcnQg QmVuY2htYXJrUnVubmVyCiAKIApAQCAtMzQsNCArMzYsNCBAQCBkZWYgbWFpbigpOgogICAgIHJl dHVybiBydW5uZXIuZXhlY3V0ZSgpCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAg bWFpbigpCisgICAgc3lzLmV4aXQobWFpbigpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2JlbmNobWFya19ydW5uZXIucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQppbmRleCBh OTcyOGEzNzg1OGExZDA0NGMwMDE5ZTJmODg2NTdhNzZkZjM5YzEyLi44NDM1MGNmODUwZTcxODc1 ZmU3N2Q4MWQ2OTc4NWZhMGYyMzkwODU2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvYmVuY2htYXJrX3J1bm5lci5weQpAQCAtNzIs NyArNzIsNyBAQCBjbGFzcyBCZW5jaG1hcmtSdW5uZXIob2JqZWN0KToKIAogICAgIEBjbGFzc21l dGhvZAogICAgIGRlZiBkdW1wKGNscywgcmVzdWx0cywgb3V0cHV0RmlsZSk6Ci0gICAgICAgIF9s b2cuaW5mbygnRHVtcHBpbmcgdGhlIHJlc3VsdHMgdG8gZmlsZScpCisgICAgICAgIF9sb2cuaW5m bygnRHVtcGluZyB0aGUgcmVzdWx0cyB0byBmaWxlJykKICAgICAgICAgdHJ5OgogICAgICAgICAg ICAgd2l0aCBvcGVuKG91dHB1dEZpbGUsICd3JykgYXMgZnA6CiAgICAgICAgICAgICAgICAganNv bi5kdW1wKHJlc3VsdHMsIGZwKQpAQCAtODIsMTEgKzgyLDEzIEBAIGNsYXNzIEJlbmNobWFya1J1 bm5lcihvYmplY3QpOgogCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIHdyYXAoY2xzLCBkaWN0 cyk6CisgICAgICAgIF9sb2cuaW5mbygnTWVyZ2luZyBmb2xsb3dpbmcgcmVzdWx0czpcbiVzJywg anNvbi5kdW1wcyhkaWN0cykpCiAgICAgICAgIGlmIG5vdCBkaWN0czoKICAgICAgICAgICAgIHJl dHVybiBOb25lCiAgICAgICAgIHJldCA9IHt9CiAgICAgICAgIGZvciBkaWMgaW4gZGljdHM6CiAg ICAgICAgICAgICByZXQgPSBjbHMubWVyZ2UocmV0LCBkaWMpCisgICAgICAgIF9sb2cuaW5mbygn UmVzdWx0cyBhZnRlciBtZXJnaW5nOlxuJXMnLCBqc29uLmR1bXBzKHJldCkpCiAgICAgICAgIHJl dHVybiByZXQKIAogICAgIEBjbGFzc21ldGhvZApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJpdmVyL29zeF9zYWZhcmlfZHJpdmVy LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2Jyb3dzZXJfZHJp dmVyL29zeF9zYWZhcmlfZHJpdmVyLnB5CmluZGV4IGE2MzY1MmI2ZjUzOTc3MzQyNDA0NWQyNTIy Mjc2ODZlMTMxODM5Y2QuLmZkYjkwNmI0Y2U3YTAwYjBmNmExMDgyZmYxZWUzYTY5MDk2MDUzYjgg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9icm93 c2VyX2RyaXZlci9vc3hfc2FmYXJpX2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2JlbmNobWFya19ydW5uZXIvYnJvd3Nlcl9kcml2ZXIvb3N4X3NhZmFyaV9kcml2ZXIucHkK QEAgLTE3LDYgKzE3LDcgQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogY2xh c3MgT1NYU2FmYXJpRHJpdmVyKEJyb3dzZXJEcml2ZXIpOgogCiAgICAgZGVmIHByZXBhcmVFbnYo c2VsZik6CisgICAgICAgIHNlbGYuc2FmYXJpUHJvY2VzcyA9IE5vbmUKICAgICAgICAgc2VsZi5j bG9zZUJyb3dzZXJzKCkKICAgICAgICAgZm9yY2VSZW1vdmUob3MucGF0aC5qb2luKG9zLnBhdGgu ZXhwYW5kdXNlcignficpLCAnTGlicmFyeS9TYXZlZCBBcHBsaWNhdGlvbiBTdGF0ZS9jb20uYXBw bGUuU2FmYXJpLnNhdmVkU3RhdGUnKSkKICAgICAgICAgZm9yY2VSZW1vdmUob3MucGF0aC5qb2lu KG9zLnBhdGguZXhwYW5kdXNlcignficpLCAnTGlicmFyeS9TYWZhcmkvTGFzdFNlc3Npb24ucGxp c3QnKSkKQEAgLTI2LDcgKzI3LDcgQEAgY2xhc3MgT1NYU2FmYXJpRHJpdmVyKEJyb3dzZXJEcml2 ZXIpOgogICAgICAgICBhcmdzID0gW29zLnBhdGguam9pbihicm93c2VyQnVpbGRQYXRoLCAnU2Fm YXJpLmFwcC9Db250ZW50cy9NYWNPUy9TYWZhcmknKV0KICAgICAgICAgYXJncy5leHRlbmQoc2Vs Zi5zYWZhcmlQcmVmZXJlbmNlcykKICAgICAgICAgX2xvZy5pbmZvKCdMYXVuY2hpbmcgc2FmYXJp OiAlcyB3aXRoIHVybDogJXMnICUgKGFyZ3NbMF0sIHVybCkpCi0gICAgICAgIHN1YnByb2Nlc3Mu UG9wZW4oYXJncywgZW52PXsnRFlMRF9GUkFNRVdPUktfUEFUSCc6IGJyb3dzZXJCdWlsZFBhdGgs ICdEWUxEX0xJQlJBUllfUEFUSCc6IGJyb3dzZXJCdWlsZFBhdGh9LCBzdGRpbj1zdWJwcm9jZXNz LlBJUEUsIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHN0ZGVycj1zdWJwcm9jZXNzLlBJUEUpCisg ICAgICAgIHNlbGYuc2FmYXJpUHJvY2VzcyA9IHN1YnByb2Nlc3MuUG9wZW4oYXJncywgZW52PXsn RFlMRF9GUkFNRVdPUktfUEFUSCc6IGJyb3dzZXJCdWlsZFBhdGgsICdEWUxEX0xJQlJBUllfUEFU SCc6IGJyb3dzZXJCdWlsZFBhdGh9LCBzdGRpbj1zdWJwcm9jZXNzLlBJUEUsIHN0ZG91dD1zdWJw cm9jZXNzLlBJUEUsIHN0ZGVycj1zdWJwcm9jZXNzLlBJUEUpCiAgICAgICAgICMgU3RvcCBmb3Ig aW5pdGlhbGl6YXRpb24gb2YgdGhlIHNhZmFyaSBwcm9jZXNzLCBvdGhlcndpc2UsIG9wZW4KICAg ICAgICAgIyBjb21tYW5kIG1heSB1c2UgdGhlIHN5c3RlbSBzYWZhcmkuCiAgICAgICAgIHRpbWUu c2xlZXAoMykKQEAgLTM3LDMgKzM4LDcgQEAgY2xhc3MgT1NYU2FmYXJpRHJpdmVyKEJyb3dzZXJE cml2ZXIpOgogICAgICAgICBzYWZhcmlJbnN0YW5jZXMgPSBOU1J1bm5pbmdBcHBsaWNhdGlvbi5y dW5uaW5nQXBwbGljYXRpb25zV2l0aEJ1bmRsZUlkZW50aWZpZXJfKCdjb20uYXBwbGUuU2FmYXJp JykKICAgICAgICAgZm9yIHNhZmFyaUluc3RhbmNlIGluIHNhZmFyaUluc3RhbmNlczoKICAgICAg ICAgICAgIHNhZmFyaUluc3RhbmNlLnRlcm1pbmF0ZSgpCisgICAgICAgIGlmIHNlbGYuc2FmYXJp UHJvY2VzczoKKyAgICAgICAgICAgIF9sb2cuaW5mbygnU2FmYXJpIHByb2Nlc3MgY29uc29sZSBv dXRwdXQ6XG5zdGRvdXQ6ICVzXG5zdGRlcnI6ICVzJyAlIHNlbGYuc2FmYXJpUHJvY2Vzcy5jb21t dW5pY2F0ZSgpKQorICAgICAgICAgICAgaWYgc2VsZi5zYWZhcmlQcm9jZXNzLnJldHVybmNvZGU6 CisgICAgICAgICAgICAgICAgX2xvZy5lcnJvcignU2FmYXJpIENyYXNoZWQhJykK