115325 2013-04-28 04:49:25 -0700 Remove Chromium code from Tools/BuildSlaveSupport 2013-04-28 23:51:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan benjamin rniwa oldest_to_newest 882379 0 zan 2013-04-28 04:49:25 -0700 Remove Chromium code from Tools/BuildSlaveSupport 882380 1 199963 zan 2013-04-28 05:00:54 -0700 Created attachment 199963 Patch 882419 2 199963 benjamin 2013-04-28 15:33:37 -0700 Comment on attachment 199963 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199963&action=review Gosh, we keep cleaning and you keep finding crap everywhere :( > Tools/BuildSlaveSupport/built-product-archive:95 > - > - # Chromium bots may not have this directory > if not os.path.isdir(archiveDir): > os.mkdir(archiveDir) Shouldn't the if go away? If the comment is correct, it has become useless. 882423 3 199963 rniwa 2013-04-28 15:46:35 -0700 Comment on attachment 199963 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=199963&action=review >> Tools/BuildSlaveSupport/built-product-archive:95 >> os.mkdir(archiveDir) > > Shouldn't the if go away? > If the comment is correct, it has become useless. Yup, we should get rid of it. > Tools/BuildSlaveSupport/test-result-archive:-101 > - zipper = zipfile.ZipFile(archiveFile, 'w', zipfile.ZIP_DEFLATED) You can also remove zipfile from the import list. 882484 4 zan 2013-04-28 23:50:18 -0700 Committed r149270: <http://trac.webkit.org/changeset/149270> 882485 5 zan 2013-04-28 23:51:20 -0700 (In reply to comment #4) > Committed r149270: <http://trac.webkit.org/changeset/149270> ... with all the comments addressed, thanks for the reviews. 199963 2013-04-28 05:00:54 -0700 2013-04-28 15:46:35 -0700 Patch bug-115325-20130428140011.patch text/plain 12771 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5MjU3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzFlMTk4YTllZTI0Y2EyMGFhM2M1MjQ2NmM0OWYzZDQy MDNlNmU4ZC4uMzZiM2MxMjE4YjgzZTIzMTJjMzQ4MzkyNjQwZjQyMjU2OGRlZDY4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEzLTA0LTI4ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKwor ICAgICAgICBSZW1vdmUgQ2hyb21pdW0gY29kZSBmcm9tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUzMjUK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg dGhlIHR3byBDaHJvbWl1bS1zcGVjaWZpYyBzY3JpcHRzIGFuZCB0aGUgQ2hyb21pdW0tc3BlY2lm aWMgcGFydHMgZnJvbSB0aGUgY29kZQorICAgICAgICBjb3ZlcmluZyBhcmNoaXZpbmcgdGVzdCBy ZXN1bHRzIGFuZCBidWlsdCBwcm9kdWN0cy4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0 L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZToKKyAgICAgICAgKGFyY2hpdmVCdWlsdFByb2R1Y3QpOgor ICAgICAgICAoZXh0cmFjdEJ1aWx0UHJvZHVjdCk6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBv cnQvY2hyb21pdW0vb3V0cHV0LWFuZHJvaWQtZGV2aWNlLXN0YXR1czogUmVtb3ZlZC4KKyAgICAg ICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9jaHJvbWl1bS9yZW1vdmUtY3Jhc2gtbG9nczogUmVtb3Zl ZC4KKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC90ZXN0LXJlc3VsdC1hcmNoaXZlOgorICAg ICAgICAoYXJjaGl2ZVRlc3RSZXN1bHRzKToKKwogMjAxMy0wNC0yNyAgUmFwaGFlbCBLdWJvIGRh IENvc3RhICA8cmFwaGFlbC5rdWJvLmRhLmNvc3RhQGludGVsLmNvbT4KIAogICAgICAgICBbRUZM XSBVbnJldmlld2VkIEludGVsIGJvdHMgZml4IGFmdGVyIHIxNDkyMzEuCmRpZmYgLS1naXQgYS9U b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUgYi9Ub29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUKaW5kZXggYmE3NGZkNzM3NzQxNzlm ZGM5ZDg5NzBmMWQ4OWM2NTUzYjA3MmUyOC4uZWI4ZDUzOGQ1NGNhMjg0YTNjZWMxNzdjYTA5MTlk OTllZTFkMjRjMyAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQtcHJv ZHVjdC1hcmNoaXZlCisrKyBiL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3Qt YXJjaGl2ZQpAQCAtOTEsOCArOTEsNiBAQCBkZWYgY3JlYXRlWmlwTWFudWFsbHkoZGlyZWN0b3J5 VG9aaXAsIGFyY2hpdmVGaWxlKToKIAogZGVmIGNyZWF0ZVppcChkaXJlY3RvcnlUb1ppcCwgY29u ZmlndXJhdGlvbiwgYXJjaGl2ZUNvbmZpZ3VyYXRpb25Pbk1hYz1GYWxzZSk6CiAgICAgYXJjaGl2 ZURpciA9IG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJuYW1lKF9fZmls ZV9fKSwgIi4uIiwgIi4uIiwgIldlYktpdEJ1aWxkIikpCi0KLSAgICAjIENocm9taXVtIGJvdHMg bWF5IG5vdCBoYXZlIHRoaXMgZGlyZWN0b3J5CiAgICAgaWYgbm90IG9zLnBhdGguaXNkaXIoYXJj aGl2ZURpcik6CiAgICAgICAgIG9zLm1rZGlyKGFyY2hpdmVEaXIpCiAKQEAgLTExOCw3ICsxMTYs NyBAQCBkZWYgY3JlYXRlWmlwKGRpcmVjdG9yeVRvWmlwLCBjb25maWd1cmF0aW9uLCBhcmNoaXZl Q29uZmlndXJhdGlvbk9uTWFjPUZhbHNlKToKIAogCiBkZWYgYXJjaGl2ZUJ1aWx0UHJvZHVjdChj b25maWd1cmF0aW9uLCBwbGF0Zm9ybSwgZnVsbFBsYXRmb3JtKToKLSAgICBhc3NlcnQgcGxhdGZv cm0gaW4gKCdtYWMnLCAnd2luJywgJ3F0JywgJ2d0aycsICdlZmwnLCAnY2hyb21pdW0nKQorICAg IGFzc2VydCBwbGF0Zm9ybSBpbiAoJ21hYycsICd3aW4nLCAncXQnLCAnZ3RrJywgJ2VmbCcpCiAK ICAgICBjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oX2J1aWxkRGly ZWN0b3J5LCBjb25maWd1cmF0aW9uLnRpdGxlKCkpCiAKQEAgLTE2MiwyNiArMTYwLDYgQEAgZGVm IGFyY2hpdmVCdWlsdFByb2R1Y3QoY29uZmlndXJhdGlvbiwgcGxhdGZvcm0sIGZ1bGxQbGF0Zm9y bSk6CiAgICAgICAgIGlmIGNyZWF0ZVppcCh0aGluRGlyZWN0b3J5LCBjb25maWd1cmF0aW9uKToK ICAgICAgICAgICAgIHJldHVybiAxCiAKLSAgICBlbGlmIHBsYXRmb3JtID09ICdjaHJvbWl1bSc6 Ci0gICAgICAgIHByaW50ICJBcmNoaXZpbmciLCBjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnkK LSAgICAgICAgdGhpbkRpcmVjdG9yeSA9IG9zLnBhdGguam9pbihjb25maWd1cmF0aW9uQnVpbGRE aXJlY3RvcnksICJ0aGluIikKLQotICAgICAgICAjIFRoZSBzY3JpcHRzIHVzZSB0aGUgZXhpc3Rl bmNlIG9mIG91dC9SZWxlYXNlL2J1aWxkLm5pbmphIHRvIGRlY2lkZQotICAgICAgICAjIGlmIHRo aXMgaXMgYSBuaW5qYSBidWlsZCwgc28gZG9uJ3QgZXhjbHVkZSBidWlsZC5uaW5qYSBmcm9tIHRo ZQotICAgICAgICAjIGFyY2hpdmUuCi0gICAgICAgIGlnbm9yZVBhdHRlcm5zID0gWycuc3ZuJywg JyouYScsICcqLmQnLCAnKi5kU1lNJywgJyoubycsICcqLmlsaycsICcqLmxpYicsICcqLmlkYics Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICdCdWlsZExvZy5odG0nLCAnKi5vYmonLCAnKi5w ZGInLCAnKi5wY2gnLCAnKi50bG9nJywgJyoubGFzdGJ1aWxkc3RhdGUnLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAnKi5oJywgJyouYycsICcqLmNjJywgJyouY3BwJywgJyouc3RhbXAnXQot Ci0gICAgICAgIGlmIGZ1bGxQbGF0Zm9ybSBhbmQgZnVsbFBsYXRmb3JtID09ICdjaHJvbWl1bS1h bmRyb2lkJzoKLSAgICAgICAgICAgIGlnbm9yZVBhdHRlcm5zLmV4dGVuZChbJyouc28nLCAnKi11 bmFsaWduZWQuYXBrJywgJyotdW5zaWduZWQuYXBrJ10pCi0KLSAgICAgICAgcmVtb3ZlRGlyZWN0 b3J5SWZFeGlzdHModGhpbkRpcmVjdG9yeSkKLSAgICAgICAgY29weUJ1aWxkRmlsZXMoY29uZmln dXJhdGlvbkJ1aWxkRGlyZWN0b3J5LCB0aGluRGlyZWN0b3J5LCBpZ25vcmVQYXR0ZXJucykKLSAg ICAgICAgaWYgY3JlYXRlWmlwKHRoaW5EaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24pOgotICAgICAg ICAgICAgcmV0dXJuIDEKLQotCiBkZWYgdW56aXBBcmNoaXZlKGRpcmVjdG9yeVRvRXh0cmFjdFRv LCBjb25maWd1cmF0aW9uKToKICAgICBhcmNoaXZlRGlyID0gb3MucGF0aC5hYnNwYXRoKG9zLnBh dGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiLi4iLCAiLi4iLCAiV2ViS2l0QnVp bGQiKSkKICAgICBhc3NlcnQgb3MucGF0aC5pc2RpcihhcmNoaXZlRGlyKQpAQCAtMjAyLDcgKzE4 MCw3IEBAIGRlZiB1bnppcEFyY2hpdmUoZGlyZWN0b3J5VG9FeHRyYWN0VG8sIGNvbmZpZ3VyYXRp b24pOgogCiAKIGRlZiBleHRyYWN0QnVpbHRQcm9kdWN0KGNvbmZpZ3VyYXRpb24sIHBsYXRmb3Jt KToKLSAgICBhc3NlcnQgcGxhdGZvcm0gaW4gKCdtYWMnLCAnd2luJywgJ3F0JywgJ2d0aycsICdl ZmwnLCAnY2hyb21pdW0nKQorICAgIGFzc2VydCBwbGF0Zm9ybSBpbiAoJ21hYycsICd3aW4nLCAn cXQnLCAnZ3RrJywgJ2VmbCcpCiAKICAgICBhcmNoaXZlRmlsZSA9IG9zLnBhdGguam9pbihfYnVp bGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24gKyAiLnppcCIpCiAgICAgY29uZmlndXJhdGlvbkJ1 aWxkRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKF9idWlsZERpcmVjdG9yeSwgY29uZmlndXJhdGlv bi50aXRsZSgpKQpAQCAtMjIzLDcgKzIwMSw3IEBAIGRlZiBleHRyYWN0QnVpbHRQcm9kdWN0KGNv bmZpZ3VyYXRpb24sIHBsYXRmb3JtKToKICAgICAgICAgICAgIHJldHVybiAxCiAKICAgICAgICAg cmV0dXJuIHVuemlwQXJjaGl2ZShjb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnksIGNvbmZpZ3Vy YXRpb24pCi0gICAgZWxpZiBwbGF0Zm9ybSA9PSAncXQnIG9yIHBsYXRmb3JtID09ICdndGsnIG9y IHBsYXRmb3JtID09ICdlZmwnIG9yIHBsYXRmb3JtID09ICdjaHJvbWl1bSc6CisgICAgZWxpZiBw bGF0Zm9ybSA9PSAncXQnIG9yIHBsYXRmb3JtID09ICdndGsnIG9yIHBsYXRmb3JtID09ICdlZmwn OgogICAgICAgICBwcmludCAiRXh0cmFjdGluZyIsIGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9y eQogICAgICAgICByZXR1cm4gdW56aXBBcmNoaXZlKGNvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9y eSwgY29uZmlndXJhdGlvbikKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQv Y2hyb21pdW0vb3V0cHV0LWFuZHJvaWQtZGV2aWNlLXN0YXR1cyBiL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2Nocm9taXVtL291dHB1dC1hbmRyb2lkLWRldmljZS1zdGF0dXMKZGVsZXRlZCBmaWxl IG1vZGUgMTAwNzU1CmluZGV4IGQ3MTZjMDI2YjVlMTgwMTM3OThhNWU2OGNiZGViYWFmMzdhNzc1 YmQuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvY2hyb21pdW0vb3V0cHV0LWFuZHJvaWQtZGV2aWNlLXN0YXR1cwor KysgL2Rldi9udWxsCkBAIC0xLDgxICswLDAgQEAKLSMhL3Vzci9iaW4vZW52IHB5dGhvbgotIyBD b3B5cmlnaHQgKEMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIFJpZ2h0cyBSZXNlcnZlZC4KLSMKLSMg UmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBv ciB3aXRob3V0Ci0jIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotIyBhcmUgbWV0OgotIyAxLiBSZWRpc3RyaWJ1dGlvbnMg b2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBub3Rp Y2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIu Ci0jIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUg YWJvdmUgY29weXJpZ2h0Ci0jICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKLSMgICAgZG9jdW1lbnRhdGlvbiBhbmQv b3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KLSMKLSMg VEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIGBgQVMgSVMnJyBBTkQgQU5Z Ci0jIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElN SVRFRCBUTywgVEhFCi0jIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5E IEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgotIyBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4g Tk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUgotIyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZP UiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKLSMgRVhFTVBMQVJZ LCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LAotIyBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwgREFUQSwgT1IKLSMgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dF VkVSIENBVVNFRCBBTkQgT04gQU5ZIFRIRU9SWQotIyBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4g Q09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKLSMgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0jIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VD SCBEQU1BR0UuCi0KLWltcG9ydCByZQotaW1wb3J0IHN1YnByb2Nlc3MKLWltcG9ydCBzeXMKLQot ZGVmIEdldEF0dGFjaGVkRGV2aWNlcygpOgotICAgIHJlX2RldmljZSA9IHJlLmNvbXBpbGUoJ14o W2EtekEtWjAtOV86Li1dKylcdGRldmljZSQnLCByZS5NVUxUSUxJTkUpCi0gICAgcHJvY2VzcyA9 IHN1YnByb2Nlc3MuUG9wZW4oWydhZGInLCAnZGV2aWNlcyddLCBzdGRvdXQ9c3VicHJvY2Vzcy5Q SVBFKQotICAgIHJldHVybiByZV9kZXZpY2UuZmluZGFsbChwcm9jZXNzLmNvbW11bmljYXRlKClb MF0pCi0KLQotY2xhc3MgQW5kcm9pZERldmljZVN0YXR1cyhvYmplY3QpOgotICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBkZXZpY2Vfc2VyaWFsKToKLSAgICAgICAgc2VsZi5fZGV2aWNlX3NlcmlhbCA9 IGRldmljZV9zZXJpYWwKLQotICAgIGRlZiBfcnVuX2FkYl9jb21tYW5kKHNlbGYsIGNvbW1hbmQp OgotICAgICAgICBmdWxsX2NvbW1hbmQgPSBbJ2FkYicsICctcycsIHNlbGYuX2RldmljZV9zZXJp YWxdICsgY29tbWFuZAotICAgICAgICBzdGRvdXQsIF8gPSBzdWJwcm9jZXNzLlBvcGVuKGZ1bGxf Y29tbWFuZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkuY29tbXVuaWNhdGUoKQotICAgICAgICBy ZXR1cm4gc3Rkb3V0LnN0cmlwKCkKLQotICAgIGRlZiBkZXZpY2VfdHlwZShzZWxmKToKLSAgICAg ICAgcmV0dXJuIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2dldHByb3AnLCAncm8u YnVpbGQucHJvZHVjdCddKQotCi0gICAgZGVmIGRldmljZV9idWlsZChzZWxmKToKLSAgICAgICAg cmV0dXJuIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2dldHByb3AnLCAncm8uYnVp bGQuaWQnXSkKLQotICAgIGRlZiBkZXZpY2VfZmluZ2VycHJpbnQoc2VsZik6Ci0gICAgICAgIHJl dHVybiBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVsbCcsICdnZXRwcm9wJywgJ3JvLmJ1aWxk LmZpbmdlcnByaW50J10pCi0KLSAgICBkZWYgYmF0dGVyeV9sZXZlbChzZWxmKToKLSAgICAgICAg cmV0dXJuIHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2NhdCcsICcvc3lzL2NsYXNz L3Bvd2VyX3N1cHBseS9iYXR0ZXJ5L2NhcGFjaXR5J10pCi0KLSAgICBkZWYgYmF0dGVyeV90ZW1w ZXJhdHVyZShzZWxmKToKLSAgICAgICAgdGVtcGVyYXR1cmUgPSBzZWxmLl9ydW5fYWRiX2NvbW1h bmQoWydzaGVsbCcsICdkdW1wc3lzJywgJ2JhdHRlcnknXSkKLSAgICAgICAgcmVfdGVtcGVyYXR1 cmUgPSByZS5jb21waWxlKCd0ZW1wZXJhdHVyZTpccysoXGQrKScpCi0gICAgICAgIHJldHVybiBy ZV90ZW1wZXJhdHVyZS5maW5kYWxsKHRlbXBlcmF0dXJlKVswXQotCi0gICAgZGVmIHVzZXJuYW1l KHNlbGYpOgotICAgICAgICB1c2VybmFtZSA9IHNlbGYuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxs JywgJ2lkJ10pCi0gICAgICAgIHJlX3VzZXJuYW1lID0gcmUuY29tcGlsZSgndWlkPVxkK1woKC4r PylcKScpCi0gICAgICAgIHJldHVybiByZV91c2VybmFtZS5maW5kYWxsKHVzZXJuYW1lKVswXQot Ci0KLWRlZiBtYWluKCk6Ci0gICAgZGV2aWNlcyA9IEdldEF0dGFjaGVkRGV2aWNlcygpCi0gICAg Zm9yIGRldmljZV9zZXJpYWwgaW4gZGV2aWNlczoKLSAgICAgICAgZGV2aWNlX3N0YXR1cyA9IEFu ZHJvaWREZXZpY2VTdGF0dXMoZGV2aWNlX3NlcmlhbCkKLQotICAgICAgICBwcmludCAnRGV2aWNl ICVzICglcyknICUgKGRldmljZV9zZXJpYWwsIGRldmljZV9zdGF0dXMuZGV2aWNlX3R5cGUoKSkK LSAgICAgICAgcHJpbnQgJyAgQnVpbGQ6ICVzICglcyknICUgKGRldmljZV9zdGF0dXMuZGV2aWNl X2J1aWxkKCksIGRldmljZV9zdGF0dXMuZGV2aWNlX2ZpbmdlcnByaW50KCkpCi0gICAgICAgIHBy aW50ICcgIEJhdHRlcnk6ICVzJSUnICUgZGV2aWNlX3N0YXR1cy5iYXR0ZXJ5X2xldmVsKCkKLSAg ICAgICAgcHJpbnQgJyAgQmF0dGVyeSB0ZW1wOiAlcycgJSBkZXZpY2Vfc3RhdHVzLmJhdHRlcnlf dGVtcGVyYXR1cmUoKQotICAgICAgICBwcmludCAnICBVc2VybmFtZTogJXMnICUgZGV2aWNlX3N0 YXR1cy51c2VybmFtZSgpCi0gICAgICAgIHByaW50ICcnCi0KLQotaWYgX19uYW1lX18gPT0gJ19f bWFpbl9fJzoKLSAgICBzeXMuZXhpdChtYWluKCkpCmRpZmYgLS1naXQgYS9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9jaHJvbWl1bS9yZW1vdmUtY3Jhc2gtbG9ncyBiL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2Nocm9taXVtL3JlbW92ZS1jcmFzaC1sb2dzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDc1 NQppbmRleCA0Zjk5OWM0ZDFmNzYyMzI5OGRjMGUwYTM3MGYwZmUwZWM5NDg5MDkzLi4wMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2Nocm9taXVtL3JlbW92ZS1jcmFzaC1sb2dzCisrKyAvZGV2L251bGwKQEAgLTEsNDEg KzAsMCBAQAotIyEvdXNyL2Jpbi9lbnYgcHl0aG9uCi0jIENvcHlyaWdodCAoYykgMjAxMSBHb29n bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIwotIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKLSMgbW9kaWZpY2F0 aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25z IGFyZQotIyBtZXQ6Ci0jCi0jICAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0Ci0jIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLSMgICAgICogUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQotIyBjb3B5cmln aHQgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyCi0jIGluIHRoZSBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJv dmlkZWQgd2l0aCB0aGUKLSMgZGlzdHJpYnV0aW9uLgotIyAgICAgKiBOZWl0aGVyIHRoZSBuYW1l IG9mIEdvb2dsZSBJbmMuIG5vciB0aGUgbmFtZXMgb2YgaXRzCi0jIGNvbnRyaWJ1dG9ycyBtYXkg YmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tCi0jIHRo aXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3cml0dGVuIHBlcm1pc3Npb24uCi0j Ci0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIEFO RCBDT05UUklCVVRPUlMKLSMgIkFTIElTIiBBTkQgQU5ZIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKLSMgTElNSVRFRCBUTywgVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SCi0jIEEgUEFSVElDVUxB UiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUgQ09QWVJJR0hU Ci0jIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLAotIyBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwg REFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0jIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9G IFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLAotIyBEQVRBLCBPUiBQ Uk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkKLSMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJ QUJJTElUWSwgT1IgVE9SVAotIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBB UklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLQotaW1wb3J0 IG9zCi1pbXBvcnQgc3lzCi0KLWlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAgaWYgc3lz LnBsYXRmb3JtID09ICdsaW51eDInOgotICAgICAgICBvcy5zeXN0ZW0oJ3JtIC1yZiAvdG1wLy5v cmcuY2hyb21pdW0uKicpCi0gICAgZWxpZiBzeXMucGxhdGZvcm0gPT0gJ2Rhcndpbic6Ci0gICAg ICAgIGltcG9ydCBGb3VuZGF0aW9uCi0gICAgICAgIG9zLnN5c3RlbSgncm0gLXJmICVzJyAlIG9z LnBhdGguam9pbihGb3VuZGF0aW9uLk5TVGVtcG9yYXJ5RGlyZWN0b3J5KCksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLm9yZy5jaHJvbWl1bS4qJykpCi0g ICAgZWxpZiAnd2luJyBpbiBzeXMucGxhdGZvcm06Ci0gICAgICAgIG9zLnN5c3RlbSgnZm9yIC9k ICVkIGluICglVEVNUCVcc2NvcGVkX2RpciopIGRvIHJkIC9zIC9xICIlZCInKQpkaWZmIC0tZ2l0 IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvdGVzdC1yZXN1bHQtYXJjaGl2ZSBiL1Rvb2xzL0J1 aWxkU2xhdmVTdXBwb3J0L3Rlc3QtcmVzdWx0LWFyY2hpdmUKaW5kZXggNGYxZjc1ZWFmZjk5ZTU3 ZjEwNjY0NWExOGIzMjUxYmQ5OTA1MmRjMS4uZWU3Yjk5NmY3YTVkOTViZWRjYTBiZDliMDI1OTJk NDU4OGRiZjdmOCAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvdGVzdC1yZXN1 bHQtYXJjaGl2ZQorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC90ZXN0LXJlc3VsdC1hcmNo aXZlCkBAIC00Niw3ICs0Niw3IEBAIGRlZiBtYWluKCk6CiAgICAgcmV0dXJuIGFyY2hpdmVUZXN0 UmVzdWx0cyhvcHRpb25zLmNvbmZpZ3VyYXRpb24sIG9wdGlvbnMucGxhdGZvcm0sIGxheW91dFRl c3RSZXN1bHRzRGlyKQogCiBkZWYgYXJjaGl2ZVRlc3RSZXN1bHRzKGNvbmZpZ3VyYXRpb24sIHBs YXRmb3JtLCBsYXlvdXRUZXN0UmVzdWx0c0Rpcik6Ci0gICAgYXNzZXJ0IHBsYXRmb3JtIGluICgn bWFjJywgJ3dpbicsICd3aW5jYWlybycsICdndGsnLCAncXQnLCAnY2hyb21pdW0nLCAnZWZsJykK KyAgICBhc3NlcnQgcGxhdGZvcm0gaW4gKCdtYWMnLCAnd2luJywgJ3dpbmNhaXJvJywgJ2d0aycs ICdxdCcsICdlZmwnKQogCiAgICAgdHJ5OgogICAgICAgICBvcy51bmxpbmsoYXJjaGl2ZUZpbGUp CkBAIC02OSwxMSArNjksNiBAQCBkZWYgYXJjaGl2ZVRlc3RSZXN1bHRzKGNvbmZpZ3VyYXRpb24s IHBsYXRmb3JtLCBsYXlvdXRUZXN0UmVzdWx0c0Rpcik6CiAgICAgZWxpZiBwbGF0Zm9ybSBpbiAo J3dpbicsICd3aW5jYWlybycsICdndGsnLCAncXQnLCAnZWZsJyk6CiAgICAgICAgIGlmIHN1YnBy b2Nlc3MuY2FsbChbInppcCIsICItciIsIGFyY2hpdmVGaWxlLCAiLiJdLCBjd2Q9bGF5b3V0VGVz dFJlc3VsdHNEaXIpOgogICAgICAgICAgICAgcmV0dXJuIDEKLSAgICBlbGlmIHBsYXRmb3JtID09 ICdjaHJvbWl1bSc6Ci0gICAgICAgIGN3ZCA9IG9zLmdldGN3ZCgpCi0gICAgICAgIG9zLmNoZGly KGxheW91dFRlc3RSZXN1bHRzRGlyKQotICAgICAgICB6aXBGaWxlc1JlY3Vyc2l2ZWx5KGFyY2hp dmVGaWxlLCBbIi4iXSkKLSAgICAgICAgb3MuY2hkaXIoY3dkKQogCiAgICAgdHJ5OgogICAgICAg ICBzaHV0aWwucm10cmVlKGxheW91dFRlc3RSZXN1bHRzRGlyKQpAQCAtOTEsMjYgKzg2LDUgQEAg ZGVmIGFyY2hpdmVUZXN0UmVzdWx0cyhjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSwgbGF5b3V0VGVz dFJlc3VsdHNEaXIpOgogICAgICAgICBpZiBlLmVycm5vICE9IDkwIGFuZCBlLmVycm5vICE9IDI6 CiAgICAgICAgICAgICByYWlzZQogCi1kZWYgemlwRmlsZXNSZWN1cnNpdmVseShhcmNoaXZlRmls ZSwgZmlsZXMpOgotICAgICIiIk1ha2UgYSB6aXAgYXJjaGl2ZS4KLQotICAgIEFyZ3M6Ci0gICAg ICAgIGFyY2hpdmVGaWxlOiBUaGUgcmVzdWx0YW50IHppcCBhcmNoaXZlIGZpbGUgbmFtZS4KLSAg ICAgICAgZmlsZXM6IEEgbGlzdCBvZiBmaWxlcyB0byBiZSBhcmNoaXZlZC4gIElmIGEgbGlzdCBp dGVtIGlzIGEgZGlyZWN0b3J5LAotICAgICAgICAgICAgZmlsZXMgaW4gdGhlIGRpcmVjdG9yeSBh cmUgYXJjaGl2ZWQgcmVjdXJzaXZlbHkuIiIiCi0gICAgemlwcGVyID0gemlwZmlsZS5aaXBGaWxl KGFyY2hpdmVGaWxlLCAndycsIHppcGZpbGUuWklQX0RFRkxBVEVEKQotICAgIGZvciBmaWxlIGlu IGZpbGVzOgotICAgICAgICBpZiBvcy5wYXRoLmlzZGlyKGZpbGUpOgotICAgICAgICAgICAgZm9y IGRpclBhdGgsIGRpck5hbWVzLCBmaWxlTmFtZXMgaW4gb3Mud2FsayhmaWxlKToKLSAgICAgICAg ICAgICAgICBmb3IgZmlsZU5hbWUgaW4gZmlsZU5hbWVzOgotICAgICAgICAgICAgICAgICAgICBy ZWxhdGl2ZVBhdGggPSBvcy5wYXRoLmpvaW4oZGlyUGF0aCwgZmlsZU5hbWUpCi0gICAgICAgICAg ICAgICAgICAgIHByaW50ICJBZGRpbmciLCByZWxhdGl2ZVBhdGgKLSAgICAgICAgICAgICAgICAg ICAgemlwcGVyLndyaXRlKHJlbGF0aXZlUGF0aCkKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAg IHByaW50ICJBZGRpbmciLCBmaWxlCi0gICAgICAgICAgICB6aXBwZXIud3JpdGUoZmlsZSkKLSAg ICB6aXBwZXIuY2xvc2UoKQotICAgIHByaW50ICJDcmVhdGVkIHppcCBhcmNoaXZlOiAiLCBhcmNo aXZlRmlsZQotCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHN5cy5leGl0KG1haW4o KSkK