106131 2013-01-04 13:36:47 -0800 Add a script to delete stale zero-byte build files 2013-01-05 00:21:19 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa eric lforschler simon.fraser thakis thorton wsiegrist oldest_to_newest 800588 0 rniwa 2013-01-04 13:36:47 -0800 Add a script to delete stale zero-byte bulid files 800591 1 181369 rniwa 2013-01-04 13:41:29 -0800 Created attachment 181369 Patch 800610 2 eric 2013-01-04 14:21:09 -0800 Which platform is this for? 800613 3 181369 thakis 2013-01-04 14:31:27 -0800 Comment on attachment 181369 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181369&action=review Looks fine to me, but I'm not a reviewer. > Tools/BuildSlaveSupport/delete-stale-build-files:47 > + if genericPlatform != 'mac': eseidel: This suggestes it's for the apple port > Tools/BuildSlaveSupport/delete-stale-build-files:54 > + for root, dirs, files in os.walk(directory): nit: Since you don't use dirs, you can do `for root, _, files in…` instead. > Tools/BuildSlaveSupport/delete-stale-build-files:71 > + exit_code += 1 I'd just do `= 1` 800628 4 rniwa 2013-01-04 14:45:32 -0800 (In reply to comment #2) > Which platform is this for? We’ll only do that for Mac port where we see zero-byte build files every now and then but we can certainly support other kinds of stale build files in the future (I think MSVC generates quite few of them). 800651 5 181369 tony 2013-01-04 15:03:25 -0800 Comment on attachment 181369 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=181369&action=review > Tools/ChangeLog:3 > + Add a script to delete stale zero-byte bulid files Typo: bulid -> build. > Tools/BuildSlaveSupport/delete-stale-build-files:60 > + if ext in ['.dep', '.timestamp', '.txt', '.html', '.js', '.generated'] or os.path.getsize(full_path): Nit: Use a tuple instead of a list. > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:146 > + description = ["delete stale build files"] Nit: "deleting stale build files" since this prints while the step is running. 800675 6 181391 rniwa 2013-01-04 15:20:42 -0800 Created attachment 181391 Updated per comments 800688 7 181391 tony 2013-01-04 15:32:36 -0800 Comment on attachment 181391 Updated per comments View in context: https://bugs.webkit.org/attachment.cgi?id=181391&action=review Seems fine as long as you're not seeing spurious rebuilds after running this. > Tools/ChangeLog:8 > + Reviewed by NOBODY (OOPS!). > + > + * BuildSlaveSupport/build.webkit.org-config/master.cfg: Nit: I would maybe mention that this is Apple Mac only for now. 800879 8 rniwa 2013-01-05 00:21:19 -0800 Committed r138888: <http://trac.webkit.org/changeset/138888> 181369 2013-01-04 13:41:29 -0800 2013-01-04 15:20:40 -0800 Patch bug-106131-20130104133835.patch text/plain 6172 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzODg0OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEzLTAxLTA0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIEFkZCBhIHNjcmlwdCB0byBkZWxldGUgc3RhbGUgemVyby1ieXRlIGJ1bGlkIGZp bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDYx MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisgICAg ICAgIChEZWxldGVTdGFsZUJ1aWxkRmlsZXMpOiBBZGRlZC4KKyAgICAgICAgKEZhY3RvcnkuX19p bml0X18pOiBBZGQgRGVsZXRlU3RhbGVCdWlsZEZpbGVzIHN0ZXAuCisgICAgICAgICogQnVpbGRT bGF2ZVN1cHBvcnQvZGVsZXRlLXN0YWxlLWJ1aWxkLWZpbGVzOiBBZGRlZC4KKyAgICAgICAgKG1h aW4pOiBEZWxldGUgemVyby1ieXRlIGZpbGVzIGV4Y2VwdCBvbmVzIGludGVudGlvbmFsbHkgZ2Vu ZXJhdGVkIGJ5IG91ciBidWlsZCBwcm9jZXNzLgorICAgICAgICAod2Via2l0QnVpbGREaXJlY3Rv cnkpOiBDb3BpZWQgZnJvbSBidWlsZC1wcm9kdWN0LWFyY2hpdmUuCisKIDIwMTMtMDEtMDQgIEVy aWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIEZsYWt5VGVzdFJlcG9ydGVy IHNob3VsZCBiZSByZS1lbmFibGVkIGFuZCB0YXVnaHQgaG93IHRvIHBvc3QgcGF0Y2hlcwpJbmRl eDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZGVsZXRlLXN0YWxlLWJ1aWxkLWZpbGVzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2RlbGV0ZS1zdGFsZS1idWlsZC1maWxl cwkocmV2aXNpb24gMCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2RlbGV0ZS1zdGFsZS1i dWlsZC1maWxlcwkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw4MiBAQAorIyEvdXNyL2Jpbi9weXRo b24NCisjIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVk Lg0KKyMgQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu DQorIw0KKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0DQorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMNCisjIGFyZSBtZXQ6DQorIw0KKyMgMS4g IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0DQorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLg0KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0DQorIyAgICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQ0K KyMgICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo IHRoZSBkaXN0cmlidXRpb24uDQorIw0KKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBB UFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkNCisjIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElN UExJRUQNCisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUNCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkNCisjIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTDQorIyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7DQorIyBMT1NTIE9GIFVTRSwgREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQN CisjIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUDQorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YNCisjIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuDQor DQoraW1wb3J0IG9wdHBhcnNlDQoraW1wb3J0IG9zDQoraW1wb3J0IHN1YnByb2Nlc3MNCitpbXBv cnQgc3lzDQorDQorDQorZGVmIG1haW4oKToNCisgICAgcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9u UGFyc2VyKCJ1c2FnZTogJXByb2cgW29wdGlvbnNdIikNCisgICAgcGFyc2VyLmFkZF9vcHRpb24o Ii0tcGxhdGZvcm0iLCBkZXN0PSJwbGF0Zm9ybSIpDQorICAgIHBhcnNlci5hZGRfb3B0aW9uKCIt LWRlYnVnIiwgYWN0aW9uPSJzdG9yZV9jb25zdCIsIGNvbnN0PSJkZWJ1ZyIsIGRlc3Q9ImNvbmZp Z3VyYXRpb24iKQ0KKyAgICBwYXJzZXIuYWRkX29wdGlvbigiLS1yZWxlYXNlIiwgYWN0aW9uPSJz dG9yZV9jb25zdCIsIGNvbnN0PSJyZWxlYXNlIiwgZGVzdD0iY29uZmlndXJhdGlvbiIpDQorDQor ICAgIG9wdGlvbnMsIHBhcmFtZXRlcnMgPSBwYXJzZXIucGFyc2VfYXJncygpDQorICAgIGlmIG5v dCBvcHRpb25zLnBsYXRmb3JtOg0KKyAgICAgICAgcGFyc2VyLmVycm9yKCJQbGF0Zm9ybSBpcyBy ZXF1aXJlZCIpDQorICAgICAgICByZXR1cm4gLTENCisgICAgaWYgbm90IG9wdGlvbnMuY29uZmln dXJhdGlvbjoNCisgICAgICAgIHBhcnNlci5lcnJvcigiQ29uZmlndXJhdGlvbiBpcyByZXF1aXJl ZCIpDQorICAgICAgICByZXR1cm4gLTINCisNCisgICAgZ2VuZXJpY1BsYXRmb3JtID0gb3B0aW9u cy5wbGF0Zm9ybS5zcGxpdCgnLScsIDEpWzBdDQorICAgIGlmIGdlbmVyaWNQbGF0Zm9ybSAhPSAn bWFjJzoNCisgICAgICAgIHByaW50ICdFeGl0ZWQgd2l0aG91dCByZW1vdmluZyBhbnkgZmlsZXMu Jw0KKyAgICAgICAgcmV0dXJuIDANCisNCisgICAgZGlyZWN0b3J5ID0gd2Via2l0QnVpbGREaXJl Y3RvcnkoZ2VuZXJpY1BsYXRmb3JtLCBvcHRpb25zLmNvbmZpZ3VyYXRpb24pDQorICAgIGV4aXRf Y29kZSA9IDANCisNCisgICAgZm9yIHJvb3QsIGRpcnMsIGZpbGVzIGluIG9zLndhbGsoZGlyZWN0 b3J5KToNCisgICAgICAgIGZvciBuYW1lIGluIGZpbGVzOg0KKyAgICAgICAgICAgIGZ1bGxfcGF0 aCA9IG9zLnBhdGguam9pbihyb290LCBuYW1lKQ0KKyAgICAgICAgICAgIGV4dCA9IG9zLnBhdGgu c3BsaXRleHQoZnVsbF9wYXRoKVsxXQ0KKw0KKyAgICAgICAgICAgIHRyeToNCisgICAgICAgICAg ICAgICAgaWYgZXh0IGluIFsnLmRlcCcsICcudGltZXN0YW1wJywgJy50eHQnLCAnLmh0bWwnLCAn LmpzJywgJy5nZW5lcmF0ZWQnXSBvciBvcy5wYXRoLmdldHNpemUoZnVsbF9wYXRoKToNCisgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlDQorICAgICAgICAgICAgZXhjZXB0IE9TRXJyb3IgYXMg ZXhjZXB0aW9uOg0KKyAgICAgICAgICAgICAgICBwcmludCBleGNlcHRpb24NCisgICAgICAgICAg ICAgICAgY29udGludWUNCisNCisgICAgICAgICAgICB0cnk6DQorICAgICAgICAgICAgICAgIG9z LnJlbW92ZShmdWxsX3BhdGgpDQorICAgICAgICAgICAgICAgIHByaW50ICdSZW1vdmVkJywgZnVs bF9wYXRoDQorICAgICAgICAgICAgZXhjZXB0IE9TRXJyb3IgYXMgZXhjZXB0aW9uOg0KKyAgICAg ICAgICAgICAgICBwcmludCBleGNlcHRpb24NCisgICAgICAgICAgICAgICAgZXhpdF9jb2RlICs9 IDENCisNCisgICAgcmV0dXJuIGV4aXRfY29kZQ0KKw0KKw0KK2RlZiB3ZWJraXRCdWlsZERpcmVj dG9yeShwbGF0Zm9ybSwgY29uZmlndXJhdGlvbik6DQorICAgIHJldHVybiBzdWJwcm9jZXNzLlBv cGVuKFsncGVybCcsIG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiLi4i LCAiU2NyaXB0cyIsICJ3ZWJraXQtYnVpbGQtZGlyZWN0b3J5IiksDQorICAgICAgICAiLS0iICsg cGxhdGZvcm0sICItLSIgKyBjb25maWd1cmF0aW9uLCAnLS10b3AtbGV2ZWwnXSwgc3Rkb3V0PXN1 YnByb2Nlc3MuUElQRSkuY29tbXVuaWNhdGUoKVswXS5zdHJpcCgpDQorDQorDQoraWYgX19uYW1l X18gPT0gJ19fbWFpbl9fJzoNCisgICAgc3lzLmV4aXQobWFpbigpKQ0KClByb3BlcnR5IGNoYW5n ZXMgb246IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2RlbGV0ZS1zdGFsZS1idWlsZC1maWxlcwpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCkFkZGVkOiBzdm46ZXhlY3V0YWJsZQogICArICoKCkluZGV4OiBUb29scy9CdWls ZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21h c3Rlci5jZmcJKHJldmlzaW9uIDEzODc3MykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcJKHdvcmtpbmcgY29weSkKQEAgLTE0MSw2 ICsxNDEsMTIgQEAgY2xhc3MgS2lsbE9sZFByb2Nlc3NlcyhzaGVsbC5Db21waWxlKToKICAgICBk ZXNjcmlwdGlvbkRvbmUgPSBbImtpbGxlZCBvbGQgcHJvY2Vzc2VzIl0KICAgICBjb21tYW5kID0g WyJweXRob24iLCAiLi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9jZXNzZXMi XQogCitjbGFzcyBEZWxldGVTdGFsZUJ1aWxkRmlsZXMoc2hlbGwuQ29tcGlsZSk6CisgICAgbmFt ZSA9ICJkZWxldGUgc3RhbGUgYnVpbGQgZmlsZXMiCisgICAgZGVzY3JpcHRpb24gPSBbImRlbGV0 ZSBzdGFsZSBidWlsZCBmaWxlcyJdCisgICAgZGVzY3JpcHRpb25Eb25lID0gWyJkZWxldGUgc3Rh bGUgYnVpbGQgZmlsZXMiXQorICAgIGNvbW1hbmQgPSBbInB5dGhvbiIsICIuL1Rvb2xzL0J1aWxk U2xhdmVTdXBwb3J0L2RlbGV0ZS1zdGFsZS1idWlsZC1maWxlcyIsIFdpdGhQcm9wZXJ0aWVzKCIt LXBsYXRmb3JtPSUoZnVsbFBsYXRmb3JtKXMiKSwgV2l0aFByb3BlcnRpZXMoIi0tJShjb25maWd1 cmF0aW9uKXMiKV0KKwogY2xhc3MgSW5zdGFsbEVmbERlcGVuZGVuY2llcyhzaGVsbC5TaGVsbENv bW1hbmQpOgogICAgIG5hbWUgPSAiamhidWlsZCIKICAgICBkZXNjcmlwdGlvbiA9IFsidXBkYXRp bmcgZWZsIGRlcGVuZGVuY2llcyJdCkBAIC03NDcsNiArNzUzLDcgQEAgY2xhc3MgRmFjdG9yeShm YWN0b3J5LkJ1aWxkRmFjdG9yeSk6CiAgICAgICAgICMgVGhlcmUgYXJlIG11bHRpcGxlIFF0IHNs YXZlcyBydW5uaW5nIG9uIHNhbWUgbWFjaGluZXMsIHNvIGJ1aWxkc2xhdmVzIHNob3VsZG4ndCBr aWxsIHRoZSBwcm9jZXNzZXMgb2Ygb3RoZXIgc2xhdmVzLgogICAgICAgICBpZiBub3QgcGxhdGZv cm0uc3RhcnRzd2l0aCgicXQiKToKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChLaWxsT2xkUHJv Y2Vzc2VzKCkpCisgICAgICAgIHNlbGYuYWRkU3RlcChEZWxldGVTdGFsZUJ1aWxkRmlsZXMoKSkK ICAgICAgICAgaWYgcGxhdGZvcm0gPT0gIndpbiI6CiAgICAgICAgICAgICBzZWxmLmFkZFN0ZXAo SW5zdGFsbFdpbjMyRGVwZW5kZW5jaWVzKCkpCiAgICAgICAgIGlmIHBsYXRmb3JtLnN0YXJ0c3dp dGgoImNocm9taXVtIik6Cg== 181391 2013-01-04 15:20:42 -0800 2013-01-04 15:32:36 -0800 Updated per comments bug-106131-20130104151749.patch text/plain 6171 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzODg0OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEzLTAxLTA0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIEFkZCBhIHNjcmlwdCB0byBkZWxldGUgc3RhbGUgemVyby1ieXRlIGJ1aWxkIGZp bGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDYx MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1 aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmc6CisgICAg ICAgIChEZWxldGVTdGFsZUJ1aWxkRmlsZXMpOiBBZGRlZC4KKyAgICAgICAgKEZhY3RvcnkuX19p bml0X18pOiBBZGQgRGVsZXRlU3RhbGVCdWlsZEZpbGVzIHN0ZXAuCisgICAgICAgICogQnVpbGRT bGF2ZVN1cHBvcnQvZGVsZXRlLXN0YWxlLWJ1aWxkLWZpbGVzOiBBZGRlZC4KKyAgICAgICAgKG1h aW4pOiBEZWxldGUgemVyby1ieXRlIGZpbGVzIGV4Y2VwdCBvbmVzIGludGVudGlvbmFsbHkgZ2Vu ZXJhdGVkIGJ5IG91ciBidWlsZCBwcm9jZXNzLgorICAgICAgICAod2Via2l0QnVpbGREaXJlY3Rv cnkpOiBDb3BpZWQgZnJvbSBidWlsZC1wcm9kdWN0LWFyY2hpdmUuCisKIDIwMTMtMDEtMDQgIEVy aWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIEZsYWt5VGVzdFJlcG9ydGVy IHNob3VsZCBiZSByZS1lbmFibGVkIGFuZCB0YXVnaHQgaG93IHRvIHBvc3QgcGF0Y2hlcwpJbmRl eDogVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZGVsZXRlLXN0YWxlLWJ1aWxkLWZpbGVzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2RlbGV0ZS1zdGFsZS1idWlsZC1maWxl cwkocmV2aXNpb24gMCkKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2RlbGV0ZS1zdGFsZS1i dWlsZC1maWxlcwkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw4MiBAQAorIyEvdXNyL2Jpbi9weXRo b24NCisjIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVk Lg0KKyMgQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQu DQorIw0KKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0DQorIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMNCisjIGFyZSBtZXQ6DQorIw0KKyMgMS4g IFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29w eXJpZ2h0DQorIyAgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLg0KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0DQorIyAgICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQ0K KyMgICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo IHRoZSBkaXN0cmlidXRpb24uDQorIw0KKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBB UFBMRSBBTkQgSVRTIENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORCBBTlkNCisjIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElN UExJRUQNCisjIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUNCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IEFQUExFIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkNCisjIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElB TCBEQU1BR0VTDQorIyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7DQorIyBMT1NTIE9GIFVTRSwgREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNFRCBBTkQN CisjIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJ Q1QgTElBQklMSVRZLCBPUiBUT1JUDQorIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YNCisjIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuDQor DQoraW1wb3J0IG9wdHBhcnNlDQoraW1wb3J0IG9zDQoraW1wb3J0IHN1YnByb2Nlc3MNCitpbXBv cnQgc3lzDQorDQorDQorZGVmIG1haW4oKToNCisgICAgcGFyc2VyID0gb3B0cGFyc2UuT3B0aW9u UGFyc2VyKCJ1c2FnZTogJXByb2cgW29wdGlvbnNdIikNCisgICAgcGFyc2VyLmFkZF9vcHRpb24o Ii0tcGxhdGZvcm0iLCBkZXN0PSJwbGF0Zm9ybSIpDQorICAgIHBhcnNlci5hZGRfb3B0aW9uKCIt LWRlYnVnIiwgYWN0aW9uPSJzdG9yZV9jb25zdCIsIGNvbnN0PSJkZWJ1ZyIsIGRlc3Q9ImNvbmZp Z3VyYXRpb24iKQ0KKyAgICBwYXJzZXIuYWRkX29wdGlvbigiLS1yZWxlYXNlIiwgYWN0aW9uPSJz dG9yZV9jb25zdCIsIGNvbnN0PSJyZWxlYXNlIiwgZGVzdD0iY29uZmlndXJhdGlvbiIpDQorDQor ICAgIG9wdGlvbnMsIHBhcmFtZXRlcnMgPSBwYXJzZXIucGFyc2VfYXJncygpDQorICAgIGlmIG5v dCBvcHRpb25zLnBsYXRmb3JtOg0KKyAgICAgICAgcGFyc2VyLmVycm9yKCJQbGF0Zm9ybSBpcyBy ZXF1aXJlZCIpDQorICAgICAgICByZXR1cm4gLTENCisgICAgaWYgbm90IG9wdGlvbnMuY29uZmln dXJhdGlvbjoNCisgICAgICAgIHBhcnNlci5lcnJvcigiQ29uZmlndXJhdGlvbiBpcyByZXF1aXJl ZCIpDQorICAgICAgICByZXR1cm4gLTINCisNCisgICAgZ2VuZXJpY1BsYXRmb3JtID0gb3B0aW9u cy5wbGF0Zm9ybS5zcGxpdCgnLScsIDEpWzBdDQorICAgIGlmIGdlbmVyaWNQbGF0Zm9ybSAhPSAn bWFjJzoNCisgICAgICAgIHByaW50ICdFeGl0ZWQgd2l0aG91dCByZW1vdmluZyBhbnkgZmlsZXMu Jw0KKyAgICAgICAgcmV0dXJuIDANCisNCisgICAgZGlyZWN0b3J5ID0gd2Via2l0QnVpbGREaXJl Y3RvcnkoZ2VuZXJpY1BsYXRmb3JtLCBvcHRpb25zLmNvbmZpZ3VyYXRpb24pDQorICAgIGV4aXRf Y29kZSA9IDANCisNCisgICAgZm9yIHJvb3QsIF8sIGZpbGVzIGluIG9zLndhbGsoZGlyZWN0b3J5 KToNCisgICAgICAgIGZvciBuYW1lIGluIGZpbGVzOg0KKyAgICAgICAgICAgIGZ1bGxfcGF0aCA9 IG9zLnBhdGguam9pbihyb290LCBuYW1lKQ0KKyAgICAgICAgICAgIGV4dCA9IG9zLnBhdGguc3Bs aXRleHQoZnVsbF9wYXRoKVsxXQ0KKw0KKyAgICAgICAgICAgIHRyeToNCisgICAgICAgICAgICAg ICAgaWYgZXh0IGluICgnLmRlcCcsICcudGltZXN0YW1wJywgJy50eHQnLCAnLmh0bWwnLCAnLmpz JywgJy5nZW5lcmF0ZWQnKSBvciBvcy5wYXRoLmdldHNpemUoZnVsbF9wYXRoKToNCisgICAgICAg ICAgICAgICAgICAgIGNvbnRpbnVlDQorICAgICAgICAgICAgZXhjZXB0IE9TRXJyb3IgYXMgZXhj ZXB0aW9uOg0KKyAgICAgICAgICAgICAgICBwcmludCBleGNlcHRpb24NCisgICAgICAgICAgICAg ICAgY29udGludWUNCisNCisgICAgICAgICAgICB0cnk6DQorICAgICAgICAgICAgICAgIG9zLnJl bW92ZShmdWxsX3BhdGgpDQorICAgICAgICAgICAgICAgIHByaW50ICdSZW1vdmVkJywgZnVsbF9w YXRoDQorICAgICAgICAgICAgZXhjZXB0IE9TRXJyb3IgYXMgZXhjZXB0aW9uOg0KKyAgICAgICAg ICAgICAgICBwcmludCBleGNlcHRpb24NCisgICAgICAgICAgICAgICAgZXhpdF9jb2RlICs9IDEN CisNCisgICAgcmV0dXJuIGV4aXRfY29kZQ0KKw0KKw0KK2RlZiB3ZWJraXRCdWlsZERpcmVjdG9y eShwbGF0Zm9ybSwgY29uZmlndXJhdGlvbik6DQorICAgIHJldHVybiBzdWJwcm9jZXNzLlBvcGVu KFsncGVybCcsIG9zLnBhdGguam9pbihvcy5wYXRoLmRpcm5hbWUoX19maWxlX18pLCAiLi4iLCAi U2NyaXB0cyIsICJ3ZWJraXQtYnVpbGQtZGlyZWN0b3J5IiksDQorICAgICAgICAiLS0iICsgcGxh dGZvcm0sICItLSIgKyBjb25maWd1cmF0aW9uLCAnLS10b3AtbGV2ZWwnXSwgc3Rkb3V0PXN1YnBy b2Nlc3MuUElQRSkuY29tbXVuaWNhdGUoKVswXS5zdHJpcCgpDQorDQorDQoraWYgX19uYW1lX18g PT0gJ19fbWFpbl9fJzoNCisgICAgc3lzLmV4aXQobWFpbigpKQ0KClByb3BlcnR5IGNoYW5nZXMg b246IFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2RlbGV0ZS1zdGFsZS1idWlsZC1maWxlcwpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkFkZGVkOiBzdm46ZXhlY3V0YWJsZQogICArICoKCkluZGV4OiBUb29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rl ci5jZmcJKHJldmlzaW9uIDEzODc3MykKKysrIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcJKHdvcmtpbmcgY29weSkKQEAgLTE0MSw2ICsx NDEsMTIgQEAgY2xhc3MgS2lsbE9sZFByb2Nlc3NlcyhzaGVsbC5Db21waWxlKToKICAgICBkZXNj cmlwdGlvbkRvbmUgPSBbImtpbGxlZCBvbGQgcHJvY2Vzc2VzIl0KICAgICBjb21tYW5kID0gWyJw eXRob24iLCAiLi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9raWxsLW9sZC1wcm9jZXNzZXMiXQog CitjbGFzcyBEZWxldGVTdGFsZUJ1aWxkRmlsZXMoc2hlbGwuQ29tcGlsZSk6CisgICAgbmFtZSA9 ICJkZWxldGUgc3RhbGUgYnVpbGQgZmlsZXMiCisgICAgZGVzY3JpcHRpb24gPSBbImRlbGV0aW5n IHN0YWxlIGJ1aWxkIGZpbGVzIl0KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbImRlbGV0ZSBzdGFs ZSBidWlsZCBmaWxlcyJdCisgICAgY29tbWFuZCA9IFsicHl0aG9uIiwgIi4vVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvZGVsZXRlLXN0YWxlLWJ1aWxkLWZpbGVzIiwgV2l0aFByb3BlcnRpZXMoIi0t cGxhdGZvcm09JShmdWxsUGxhdGZvcm0pcyIpLCBXaXRoUHJvcGVydGllcygiLS0lKGNvbmZpZ3Vy YXRpb24pcyIpXQorCiBjbGFzcyBJbnN0YWxsRWZsRGVwZW5kZW5jaWVzKHNoZWxsLlNoZWxsQ29t bWFuZCk6CiAgICAgbmFtZSA9ICJqaGJ1aWxkIgogICAgIGRlc2NyaXB0aW9uID0gWyJ1cGRhdGlu ZyBlZmwgZGVwZW5kZW5jaWVzIl0KQEAgLTc0Nyw2ICs3NTMsNyBAQCBjbGFzcyBGYWN0b3J5KGZh Y3RvcnkuQnVpbGRGYWN0b3J5KToKICAgICAgICAgIyBUaGVyZSBhcmUgbXVsdGlwbGUgUXQgc2xh dmVzIHJ1bm5pbmcgb24gc2FtZSBtYWNoaW5lcywgc28gYnVpbGRzbGF2ZXMgc2hvdWxkbid0IGtp bGwgdGhlIHByb2Nlc3NlcyBvZiBvdGhlciBzbGF2ZXMuCiAgICAgICAgIGlmIG5vdCBwbGF0Zm9y bS5zdGFydHN3aXRoKCJxdCIpOgogICAgICAgICAgICAgc2VsZi5hZGRTdGVwKEtpbGxPbGRQcm9j ZXNzZXMoKSkKKyAgICAgICAgc2VsZi5hZGRTdGVwKERlbGV0ZVN0YWxlQnVpbGRGaWxlcygpKQog ICAgICAgICBpZiBwbGF0Zm9ybSA9PSAid2luIjoKICAgICAgICAgICAgIHNlbGYuYWRkU3RlcChJ bnN0YWxsV2luMzJEZXBlbmRlbmNpZXMoKSkKICAgICAgICAgaWYgcGxhdGZvcm0uc3RhcnRzd2l0 aCgiY2hyb21pdW0iKToK