88575 2012-06-07 14:05:05 -0700 [chromium] Allow LayoutTests under new git workflow 2012-06-07 19:41:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tpayne dpranke abarth dpranke ojan webkit.review.bot oldest_to_newest 643883 0 tpayne 2012-06-07 14:05:05 -0700 [chromium] Allow LayoutTests under new git workflow 643888 1 146387 tpayne 2012-06-07 14:07:14 -0700 Created attachment 146387 Patch 644047 2 146387 dpranke 2012-06-07 16:33:06 -0700 Comment on attachment 146387 Patch this seems like a goofy way to figure out if you need to use .bat files, but that's not your fault. At some point this should get pushed into the classes directly. 644056 3 tpayne 2012-06-07 16:40:15 -0700 (In reply to comment #2) > (From update of attachment 146387 [details]) > this seems like a goofy way to figure out if you need to use .bat files, but that's not your fault. At some point this should get pushed into the classes directly. Goofy? But it's got *awesome* right in the name! I agree, this is odd, but I'd like to be able to run the tests. Okay, newbie question time. This is my first r+ (woot!!).... how do I submit? 644059 4 dpranke 2012-06-07 16:43:21 -0700 since you're not yet a committer, you need to get someone who is to either land it for you or mark it as cq+. If you wish that to happen, the convention is to set the cq? flag and then the reviewer will usually set cq+ at the same time as r+. But, I can land it for you as well if you like. (since I collided with you setting cq+, I can see you figured that out :). 644231 5 146387 webkit.review.bot 2012-06-07 19:41:12 -0700 Comment on attachment 146387 Patch Clearing flags on attachment: 146387 Committed r119785: <http://trac.webkit.org/changeset/119785> 644232 6 webkit.review.bot 2012-06-07 19:41:16 -0700 All reviewed patches have been landed. Closing bug. 146387 2012-06-07 14:07:14 -0700 2012-06-07 19:41:12 -0700 Patch bug-88575-20120607140714.patch text/plain 22660 tpayne U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NjgxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGNhYzliYTFhMmFlNTk4ZGVjYTk1OWM0YmEzNzQ5ZGYz N2FlOTdkMi4uNTc0N2FjMzQwODMxM2NhNjQ1MDdjNzIzODYzYzQwZjBhODJiNjNiZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYw IEBACisyMDEyLTA2LTA3ICBUb255IFBheW5lICA8dHBheW5lQGNocm9taXVtLm9yZz4KKworICAg ICAgICBbY2hyb21pdW1dIEFsbG93IExheW91dFRlc3RzIHVuZGVyIG5ldyBnaXQgd29ya2Zsb3cK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4NTc1CisK KyAgICAgICAgT24gV2luZG93cywgY2hyb21pdW0gaW5kaXJlY3RzIHRocm91Z2ggZ2l0LmJhdC4g QWRkcyB0aGUgc2FtZSBoYWNrIHRoYXQKKyAgICAgICAgaXMgY3VycmVudGx5IHVzZWQgZm9yIGRp c2NvdmVyaW5nIHN2bi5iYXQgdG8gc3VwcG9ydCB0aGUgbmV3IGdpdAorICAgICAgICB3b3JrZmxv dy4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHk6CisgICAgICAgIChHaXQp OiBSZXBsYWNlcyBhbGwgaGFyZC1jb2RlZCByZWZlcmVuY2VzIHRvICdnaXQnIHdpdGggdGhlIGNs YXNzCisgICAgICAgIHZhcmlhYmxlIGV4ZWN1dGFibGVfbmFtZS4KKyAgICAgICAgKEdpdC5fY2hl Y2tfZ2l0X2FyY2hpdGVjdHVyZSk6CisgICAgICAgIChHaXQuaW5fd29ya2luZ19kaXJlY3Rvcnkp OgorICAgICAgICAoR2l0LmZpbmRfY2hlY2tvdXRfcm9vdCk6CisgICAgICAgIChHaXQucmVhZF9n aXRfY29uZmlnKToKKyAgICAgICAgKEdpdC5kaXNjYXJkX2xvY2FsX2NvbW1pdHMpOgorICAgICAg ICAoR2l0LmxvY2FsX2NvbW1pdHMpOgorICAgICAgICAoR2l0LndvcmtpbmdfZGlyZWN0b3J5X2lz X2NsZWFuKToKKyAgICAgICAgKEdpdC5jbGVhbl93b3JraW5nX2RpcmVjdG9yeSk6CisgICAgICAg IChHaXQuc3RhdHVzX2NvbW1hbmQpOgorICAgICAgICAoR2l0LmFkZF9saXN0KToKKyAgICAgICAg KEdpdC5kZWxldGVfbGlzdCk6CisgICAgICAgIChHaXQuZXhpc3RzKToKKyAgICAgICAgKEdpdC5f Y3VycmVudF9icmFuY2gpOgorICAgICAgICAoR2l0LmNoYW5nZWRfZmlsZXMpOgorICAgICAgICAo R2l0Ll9jaGFuZ2VzX2ZpbGVzX2Zvcl9jb21taXQpOgorICAgICAgICAoR2l0LnJldmlzaW9uc19j aGFuZ2luZ19maWxlKToKKyAgICAgICAgKEdpdC5jb25mbGljdGVkX2ZpbGVzKToKKyAgICAgICAg KEdpdC5zdm5fcmV2aXNpb24pOgorICAgICAgICAoR2l0LmNyZWF0ZV9wYXRjaCk6CisgICAgICAg IChHaXQuX3J1bl9naXRfc3ZuX2ZpbmRfcmV2KToKKyAgICAgICAgKEdpdC5jb250ZW50c19hdF9y ZXZpc2lvbik6CisgICAgICAgIChHaXQuZGlmZl9mb3JfZmlsZSk6CisgICAgICAgIChHaXQuc2hv d19oZWFkKToKKyAgICAgICAgKEdpdC5jb21taXR0ZXJfZW1haWxfZm9yX3JldmlzaW9uKToKKyAg ICAgICAgKEdpdC5hcHBseV9yZXZlcnNlX2RpZmYpOgorICAgICAgICAoR2l0LnJldmVydF9maWxl cyk6CisgICAgICAgIChHaXQuY29tbWl0X3dpdGhfbWVzc2FnZSk6CisgICAgICAgIChHaXQuX2Nv bW1pdF9vbl9icmFuY2gpOgorICAgICAgICAoR2l0LnN2bl9jb21taXRfbG9nKToKKyAgICAgICAg KEdpdC5sYXN0X3N2bl9jb21taXRfbG9nKToKKyAgICAgICAgKEdpdC5zdm5fYmxhbWUpOgorICAg ICAgICAoR2l0Ll9icmFuY2hfcmVmX2V4aXN0cyk6CisgICAgICAgIChHaXQuZGVsZXRlX2JyYW5j aCk6CisgICAgICAgIChHaXQucmVtb3RlX21lcmdlX2Jhc2UpOgorICAgICAgICAoR2l0LmNvbW1p dF9sb2NhbGx5X3dpdGhfbWVzc2FnZSk6CisgICAgICAgIChHaXQucHVzaF9sb2NhbF9jb21taXRz X3RvX3NlcnZlcik6CisgICAgICAgIChHaXQuY29tbWl0X2lkc19mcm9tX2NvbW1pdGlzaF9hcmd1 bWVudHMpOgorICAgICAgICAoR2l0LmNvbW1pdF9tZXNzYWdlX2Zvcl9sb2NhbF9jb21taXQpOgor ICAgICAgICAoR2l0LmZpbGVzX2NoYW5nZWRfc3VtbWFyeV9mb3JfY29tbWl0KToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0LnB5OgorICAgICAgICAoSG9zdC5fZW5nYWdl X2F3ZXNvbWVfd2luZG93c19oYWNrcyk6IEFkZHMgYW4gYXdlc29tZSAnZ2l0LmJhdCcgaGFjawor ICAgICAgICB0aGF0IGR1cGxpY2F0ZXMgdGhlIGxvZ2ljIGluIHRoZSBleGlzdGluZyAnc3ZuLmJh dCcgaGFjay4KKwogMjAxMi0wNi0wNiAgTWFyaXVzeiBHcnplZ29yY3p5ayAgPG1hcml1c3ouZ0Bz YW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtXSzJdIENvbXBpbGUgd2Via2l0MSBhbmQgd2Vi a2l0MiBieSBkZWZhdWx0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL2dpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2No ZWNrb3V0L3NjbS9naXQucHkKaW5kZXggNDNmZGI5YzAwMzQ4NDhhYTM4NmIyOGJmZjVlNjMyMjQ2 MzgzMGQ0Zi4uODAyZDgxZGIwZGMyNzZlNzgyN2IxNDkwOGE4MjdhMjBjZWJlY2RjZSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CkBA IC02MSw2ICs2MSw4IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgICMgMSBv ciAxMjgsIG1vc3RseS4KICAgICBFUlJPUl9GSUxFX0lTX01JU1NJTkcgPSAxMjgKIAorICAgIGV4 ZWN1dGFibGVfbmFtZSA9ICdnaXQnCisKICAgICBkZWYgX19pbml0X18oc2VsZiwgY3dkLCAqKmt3 YXJncyk6CiAgICAgICAgIFNDTS5fX2luaXRfXyhzZWxmLCBjd2QsICoqa3dhcmdzKQogICAgICAg ICBzZWxmLl9jaGVja19naXRfYXJjaGl0ZWN0dXJlKCkKQEAgLTg5LDcgKzkxLDcgQEAgY2xhc3Mg R2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAKICAgICAgICAgIyBXZSBjb3VsZCBwYXRoLXNlYXJj aCBlbnRpcmVseSBpbiBweXRob24gb3Igd2l0aAogICAgICAgICAjIHdoaWNoLnB5IChodHRwOi8v Y29kZS5nb29nbGUuY29tL3Avd2hpY2gpLCBidXQgdGhpcyBpcyBlYXNpZXI6Ci0gICAgICAgIGdp dF9wYXRoID0gc2VsZi5ydW4oWyd3aGljaCcsICdnaXQnXSkucnN0cmlwKCkKKyAgICAgICAgZ2l0 X3BhdGggPSBzZWxmLnJ1bihbJ3doaWNoJywgc2VsZi5leGVjdXRhYmxlX25hbWVdKS5yc3RyaXAo KQogICAgICAgICBpZiBzZWxmLl9leGVjdXRhYmxlX2lzXzY0Yml0KGdpdF9wYXRoKToKICAgICAg ICAgICAgIHJldHVybgogCkBAIC0xMDAsMTQgKzEwMiwxNCBAQCBjbGFzcyBHaXQoU0NNLCBTVk5S ZXBvc2l0b3J5KToKICAgICBkZWYgaW5fd29ya2luZ19kaXJlY3RvcnkoY2xzLCBwYXRoKToKICAg ICAgICAgdHJ5OgogICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBzaG91bGQgdXNlIGFuIEV4ZWN1 dGl2ZS4KLSAgICAgICAgICAgIHJldHVybiBydW5fY29tbWFuZChbJ2dpdCcsICdyZXYtcGFyc2Un LCAnLS1pcy1pbnNpZGUtd29yay10cmVlJ10sIGN3ZD1wYXRoLCBlcnJvcl9oYW5kbGVyPUV4ZWN1 dGl2ZS5pZ25vcmVfZXJyb3IpLnJzdHJpcCgpID09ICJ0cnVlIgorICAgICAgICAgICAgcmV0dXJu IHJ1bl9jb21tYW5kKFtjbHMuZXhlY3V0YWJsZV9uYW1lLCAncmV2LXBhcnNlJywgJy0taXMtaW5z aWRlLXdvcmstdHJlZSddLCBjd2Q9cGF0aCwgZXJyb3JfaGFuZGxlcj1FeGVjdXRpdmUuaWdub3Jl X2Vycm9yKS5yc3RyaXAoKSA9PSAidHJ1ZSIKICAgICAgICAgZXhjZXB0IE9TRXJyb3IsIGU6CiAg ICAgICAgICAgICAjIFRoZSBXaW5kb3dzIGJvdHMgc2VlbSB0byB0aHJvdWdoIGEgV2luZG93c0Vy cm9yIHdoZW4gZ2l0IGlzbid0IGluc3RhbGxlZC4KICAgICAgICAgICAgIHJldHVybiBGYWxzZQog CiAgICAgZGVmIGZpbmRfY2hlY2tvdXRfcm9vdChzZWxmLCBwYXRoKToKICAgICAgICAgIyAiZ2l0 IHJldi1wYXJzZSAtLXNob3ctY2R1cCIgd291bGQgYmUgYW5vdGhlciB3YXkgdG8gZ2V0IHRvIHRo ZSByb290Ci0gICAgICAgIGdpdF9vdXRwdXQgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQo WydnaXQnLCAncmV2LXBhcnNlJywgJy0tZ2l0LWRpciddLCBjd2Q9KHBhdGggb3IgIi4vIikpCisg ICAgICAgIGdpdF9vdXRwdXQgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoW3NlbGYuZXhl Y3V0YWJsZV9uYW1lLCAncmV2LXBhcnNlJywgJy0tZ2l0LWRpciddLCBjd2Q9KHBhdGggb3IgIi4v IikpCiAgICAgICAgIChjaGVja291dF9yb290LCBkb3RfZ2l0KSA9IHNlbGYuX2ZpbGVzeXN0ZW0u c3BsaXQoZ2l0X291dHB1dCkKICAgICAgICAgaWYgbm90IHNlbGYuX2ZpbGVzeXN0ZW0uaXNhYnMo Y2hlY2tvdXRfcm9vdCk6ICAjIFNvbWV0aW1lcyBnaXQgcmV0dXJucyByZWxhdGl2ZSBwYXRocwog ICAgICAgICAgICAgY2hlY2tvdXRfcm9vdCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihwYXRoLCBj aGVja291dF9yb290KQpAQCAtMTI1LDcgKzEyNyw3IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9z aXRvcnkpOgogICAgICAgICAjIFBhc3MgLS1nZXQtYWxsIGZvciBjYXNlcyB3aGVyZSB0aGUgY29u ZmlnIGhhcyBtdWx0aXBsZSB2YWx1ZXMKICAgICAgICAgIyBQYXNzIHRoZSBjd2QgaWYgcHJvdmlk ZWQgc28gdGhhdCB3ZSBjYW4gaGFuZGxlIHRoZSBjYXNlIG9mIHJ1bm5pbmcgd2Via2l0LXBhdGNo IG91dHNpZGUgb2YgdGhlIHdvcmtpbmcgZGlyZWN0b3J5LgogICAgICAgICAjIEZJWE1FOiBUaGlz IHNob3VsZCB1c2UgYW4gRXhlY3V0aXZlLgotICAgICAgICByZXR1cm4gcnVuX2NvbW1hbmQoWyJn aXQiLCAiY29uZmlnIiwgIi0tZ2V0LWFsbCIsIGtleV0sIGVycm9yX2hhbmRsZXI9RXhlY3V0aXZl Lmlnbm9yZV9lcnJvciwgY3dkPWN3ZCkucnN0cmlwKCdcbicpCisgICAgICAgIHJldHVybiBydW5f Y29tbWFuZChbY2xzLmV4ZWN1dGFibGVfbmFtZSwgImNvbmZpZyIsICItLWdldC1hbGwiLCBrZXld LCBlcnJvcl9oYW5kbGVyPUV4ZWN1dGl2ZS5pZ25vcmVfZXJyb3IsIGN3ZD1jd2QpLnJzdHJpcCgn XG4nKQogCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBjb21taXRfc3VjY2Vzc19yZWdleHAo KToKQEAgLTEzMyw0OCArMTM1LDQ4IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgog CiAgICAgZGVmIGRpc2NhcmRfbG9jYWxfY29tbWl0cyhzZWxmKToKICAgICAgICAgIyBGSVhNRTog VGhpcyBzaG91bGQgcHJvYmFibHkgdXNlIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QKLSAgICAgICAg c2VsZi5ydW4oWydnaXQnLCAncmVzZXQnLCAnLS1oYXJkJywgc2VsZi5yZW1vdGVfYnJhbmNoX3Jl ZigpXSkKKyAgICAgICAgc2VsZi5ydW4oW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAncmVzZXQnLCAn LS1oYXJkJywgc2VsZi5yZW1vdGVfYnJhbmNoX3JlZigpXSkKIAogICAgIGRlZiBsb2NhbF9jb21t aXRzKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnbG9nJywgJy0tcHJl dHR5PW9uZWxpbmUnLCAnSEVBRC4uLicgKyBzZWxmLnJlbW90ZV9icmFuY2hfcmVmKCldLCBjd2Q9 c2VsZi5jaGVja291dF9yb290KS5zcGxpdGxpbmVzKCkKKyAgICAgICAgcmV0dXJuIHNlbGYucnVu KFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2xvZycsICctLXByZXR0eT1vbmVsaW5lJywgJ0hFQUQu Li4nICsgc2VsZi5yZW1vdGVfYnJhbmNoX3JlZigpXSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCku c3BsaXRsaW5lcygpCiAKICAgICBkZWYgcmViYXNlX2luX3Byb2dyZXNzKHNlbGYpOgogICAgICAg ICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMoc2VsZi5hYnNvbHV0ZV9wYXRoKHNlbGYu X2ZpbGVzeXN0ZW0uam9pbignLmdpdCcsICdyZWJhc2UtYXBwbHknKSkpCiAKICAgICBkZWYgd29y a2luZ19kaXJlY3RvcnlfaXNfY2xlYW4oc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihb J2dpdCcsICdkaWZmJywgJ0hFQUQnLCAnLS1uby1yZW5hbWVzJywgJy0tbmFtZS1vbmx5J10sIGN3 ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpID09ICIiCisgICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2Vs Zi5leGVjdXRhYmxlX25hbWUsICdkaWZmJywgJ0hFQUQnLCAnLS1uby1yZW5hbWVzJywgJy0tbmFt ZS1vbmx5J10sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpID09ICIiCiAKICAgICBkZWYgY2xlYW5f d29ya2luZ19kaXJlY3Rvcnkoc2VsZik6CiAgICAgICAgICMgRklYTUU6IFRoZXNlIHNob3VsZCBw cm9iYWJseSB1c2UgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdC4KICAgICAgICAgIyBDb3VsZCBydW4g Z2l0IGNsZWFuIGhlcmUgdG9vLCBidXQgdGhhdCB3b3VsZG4ndCBtYXRjaCB3b3JraW5nX2RpcmVj dG9yeV9pc19jbGVhbgotICAgICAgICBzZWxmLnJ1bihbJ2dpdCcsICdyZXNldCcsICctLWhhcmQn LCAnSEVBRCddKQorICAgICAgICBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdyZXNl dCcsICctLWhhcmQnLCAnSEVBRCddKQogICAgICAgICAjIEFib3J0aW5nIHJlYmFzZSBldmVuIHRo b3VnaCB0aGlzIGRvZXMgbm90IG1hdGNoIHdvcmtpbmdfZGlyZWN0b3J5X2lzX2NsZWFuCiAgICAg ICAgIGlmIHNlbGYucmViYXNlX2luX3Byb2dyZXNzKCk6Ci0gICAgICAgICAgICBzZWxmLnJ1bihb J2dpdCcsICdyZWJhc2UnLCAnLS1hYm9ydCddKQorICAgICAgICAgICAgc2VsZi5ydW4oW3NlbGYu ZXhlY3V0YWJsZV9uYW1lLCAncmViYXNlJywgJy0tYWJvcnQnXSkKIAogICAgIGRlZiBzdGF0dXNf Y29tbWFuZChzZWxmKToKICAgICAgICAgIyBnaXQgc3RhdHVzIHJldHVybnMgbm9uLXplcm8gd2hl biB0aGVyZSBhcmUgY2hhbmdlcywgc28gd2UgdXNlIGdpdCBkaWZmIG5hbWUgLS1uYW1lLXN0YXR1 cyBIRUFEIGluc3RlYWQuCiAgICAgICAgICMgTm8gZmlsZSBjb250ZW50cyBwcmludGVkLCB0aHVz IHV0Zi04IGF1dG9kZWNvZGluZyBpbiBzZWxmLnJ1biBpcyBmaW5lLgotICAgICAgICByZXR1cm4g WyJnaXQiLCAiZGlmZiIsICItLW5hbWUtc3RhdHVzIiwgIi0tbm8tcmVuYW1lcyIsICJIRUFEIl0K KyAgICAgICAgcmV0dXJuIFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgImRpZmYiLCAiLS1uYW1lLXN0 YXR1cyIsICItLW5vLXJlbmFtZXMiLCAiSEVBRCJdCiAKICAgICBkZWYgX3N0YXR1c19yZWdleHAo c2VsZiwgZXhwZWN0ZWRfdHlwZXMpOgogICAgICAgICByZXR1cm4gJ14oP1A8c3RhdHVzPlslc10p XHQoP1A8ZmlsZW5hbWU+LispJCcgJSBleHBlY3RlZF90eXBlcwogCiAgICAgZGVmIGFkZF9saXN0 KHNlbGYsIHBhdGhzLCByZXR1cm5fZXhpdF9jb2RlPUZhbHNlKToKLSAgICAgICAgcmV0dXJuIHNl bGYucnVuKFsiZ2l0IiwgImFkZCJdICsgcGF0aHMsIHJldHVybl9leGl0X2NvZGU9cmV0dXJuX2V4 aXRfY29kZSkKKyAgICAgICAgcmV0dXJuIHNlbGYucnVuKFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwg ImFkZCJdICsgcGF0aHMsIHJldHVybl9leGl0X2NvZGU9cmV0dXJuX2V4aXRfY29kZSkKIAogICAg IGRlZiBkZWxldGVfbGlzdChzZWxmLCBwYXRocyk6Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihb ImdpdCIsICJybSIsICItZiJdICsgcGF0aHMpCisgICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2Vs Zi5leGVjdXRhYmxlX25hbWUsICJybSIsICItZiJdICsgcGF0aHMpCiAKICAgICBkZWYgZXhpc3Rz KHNlbGYsIHBhdGgpOgotICAgICAgICByZXR1cm5fY29kZSA9IHNlbGYucnVuKFsiZ2l0IiwgInNo b3ciLCAiSEVBRDolcyIgJSBwYXRoXSwgcmV0dXJuX2V4aXRfY29kZT1UcnVlLCBkZWNvZGVfb3V0 cHV0PUZhbHNlKQorICAgICAgICByZXR1cm5fY29kZSA9IHNlbGYucnVuKFtzZWxmLmV4ZWN1dGFi bGVfbmFtZSwgInNob3ciLCAiSEVBRDolcyIgJSBwYXRoXSwgcmV0dXJuX2V4aXRfY29kZT1UcnVl LCBkZWNvZGVfb3V0cHV0PUZhbHNlKQogICAgICAgICByZXR1cm4gcmV0dXJuX2NvZGUgIT0gc2Vs Zi5FUlJPUl9GSUxFX0lTX01JU1NJTkcKIAogICAgIGRlZiBfYnJhbmNoX2Zyb21fcmVmKHNlbGYs IHJlZik6CiAgICAgICAgIHJldHVybiByZWYucmVwbGFjZSgncmVmcy9oZWFkcy8nLCAnJykKIAog ICAgIGRlZiBfY3VycmVudF9icmFuY2goc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9icmFu Y2hfZnJvbV9yZWYoc2VsZi5ydW4oWydnaXQnLCAnc3ltYm9saWMtcmVmJywgJy1xJywgJ0hFQUQn XSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkuc3RyaXAoKSkKKyAgICAgICAgcmV0dXJuIHNlbGYu X2JyYW5jaF9mcm9tX3JlZihzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdzeW1ib2xp Yy1yZWYnLCAnLXEnLCAnSEVBRCddLCBjd2Q9c2VsZi5jaGVja291dF9yb290KS5zdHJpcCgpKQog CiAgICAgZGVmIF91cHN0cmVhbV9icmFuY2goc2VsZik6CiAgICAgICAgIGN1cnJlbnRfYnJhbmNo ID0gc2VsZi5fY3VycmVudF9icmFuY2goKQpAQCAtMjAxLDE0ICsyMDMsMTQgQEAgY2xhc3MgR2l0 KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAKICAgICBkZWYgY2hhbmdlZF9maWxlcyhzZWxmLCBnaXRf Y29tbWl0PU5vbmUpOgogICAgICAgICAjIEZJWE1FOiAtLWRpZmYtZmlsdGVyIGNvdWxkIGJlIHVz ZWQgdG8gYXZvaWQgdGhlICJleHRyYWN0X2ZpbGVuYW1lcyIgc3RlcC4KLSAgICAgICAgc3RhdHVz X2NvbW1hbmQgPSBbJ2dpdCcsICdkaWZmJywgJy1yJywgJy0tbmFtZS1zdGF0dXMnLCAiLS1uby1y ZW5hbWVzIiwgIi0tbm8tZXh0LWRpZmYiLCAiLS1mdWxsLWluZGV4Iiwgc2VsZi5tZXJnZV9iYXNl KGdpdF9jb21taXQpXQorICAgICAgICBzdGF0dXNfY29tbWFuZCA9IFtzZWxmLmV4ZWN1dGFibGVf bmFtZSwgJ2RpZmYnLCAnLXInLCAnLS1uYW1lLXN0YXR1cycsICItLW5vLXJlbmFtZXMiLCAiLS1u by1leHQtZGlmZiIsICItLWZ1bGwtaW5kZXgiLCBzZWxmLm1lcmdlX2Jhc2UoZ2l0X2NvbW1pdCld CiAgICAgICAgICMgRklYTUU6IEknbSBub3Qgc3VyZSB3ZSdyZSByZXR1cm5pbmcgdGhlIHNhbWUg c2V0IG9mIGZpbGVzIHRoYXQgU1ZOLmNoYW5nZWRfZmlsZXMgaXMuCiAgICAgICAgICMgQWRkZWQg KEEpLCBDb3BpZWQgKEMpLCBEZWxldGVkIChEKSwgTW9kaWZpZWQgKE0pLCBSZW5hbWVkIChSKQog ICAgICAgICByZXR1cm4gc2VsZi5ydW5fc3RhdHVzX2FuZF9leHRyYWN0X2ZpbGVuYW1lcyhzdGF0 dXNfY29tbWFuZCwgc2VsZi5fc3RhdHVzX3JlZ2V4cCgiQURNIikpCiAKICAgICBkZWYgX2NoYW5n ZXNfZmlsZXNfZm9yX2NvbW1pdChzZWxmLCBnaXRfY29tbWl0KToKICAgICAgICAgIyAtLXByZXR0 eT0iZm9ybWF0OiIgbWFrZXMgZ2l0IHNob3cgbm90IHByaW50IHRoZSBjb21taXQgbG9nIGhlYWRl ciwKLSAgICAgICAgY2hhbmdlZF9maWxlcyA9IHNlbGYucnVuKFsiZ2l0IiwgInNob3ciLCAiLS1w cmV0dHk9Zm9ybWF0OiIsICItLW5hbWUtb25seSIsIGdpdF9jb21taXRdKS5zcGxpdGxpbmVzKCkK KyAgICAgICAgY2hhbmdlZF9maWxlcyA9IHNlbGYucnVuKFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwg InNob3ciLCAiLS1wcmV0dHk9Zm9ybWF0OiIsICItLW5hbWUtb25seSIsIGdpdF9jb21taXRdKS5z cGxpdGxpbmVzKCkKICAgICAgICAgIyBpbnN0ZWFkIGl0IGp1c3QgcHJpbnRzIGEgYmxhbmsgbGlu ZSBhdCB0aGUgdG9wLCBzbyB3ZSBza2lwIHRoZSBibGFuayBsaW5lOgogICAgICAgICByZXR1cm4g Y2hhbmdlZF9maWxlc1sxOl0KIApAQCAtMjIyLDEzICsyMjQsMTMgQEAgY2xhc3MgR2l0KFNDTSwg U1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgICAgICByYWlzZSBTY3JpcHRFcnJvcihtZXNzYWdlPSJQ YXRoICVzIGRvZXMgbm90IGV4aXN0LiIgJSBwYXRoKQogCiAgICAgICAgICMgZ2l0IHJldi1saXN0 IGhlYWQgLS1yZW1vdmUtZW1wdHkgLS1saW1pdD01IC0tIHBhdGggd291bGQgYmUgZXF1aXZhbGVu dC4KLSAgICAgICAgY29tbWl0X2lkcyA9IHNlbGYucnVuKFsiZ2l0IiwgImxvZyIsICItLXJlbW92 ZS1lbXB0eSIsICItLXByZXR0eT1mb3JtYXQ6JUgiLCAiLSVzIiAlIGxpbWl0LCAiLS0iLCBwYXRo XSkuc3BsaXRsaW5lcygpCisgICAgICAgIGNvbW1pdF9pZHMgPSBzZWxmLnJ1bihbc2VsZi5leGVj dXRhYmxlX25hbWUsICJsb2ciLCAiLS1yZW1vdmUtZW1wdHkiLCAiLS1wcmV0dHk9Zm9ybWF0OiVI IiwgIi0lcyIgJSBsaW1pdCwgIi0tIiwgcGF0aF0pLnNwbGl0bGluZXMoKQogICAgICAgICByZXR1 cm4gZmlsdGVyKGxhbWJkYSByZXZpc2lvbjogcmV2aXNpb24sIG1hcChzZWxmLnN2bl9yZXZpc2lv bl9mcm9tX2dpdF9jb21taXQsIGNvbW1pdF9pZHMpKQogCiAgICAgZGVmIGNvbmZsaWN0ZWRfZmls ZXMoc2VsZik6CiAgICAgICAgICMgV2UgZG8gbm90IG5lZWQgdG8gcGFzcyBkZWNvZGVfb3V0cHV0 IGZvciB0aGlzIGRpZmYgY29tbWFuZAogICAgICAgICAjIGFzIHdlJ3JlIHBhc3NpbmcgLS1uYW1l LXN0YXR1cyB3aGljaCBkb2VzIG5vdCBvdXRwdXQgYW55IGRhdGEuCi0gICAgICAgIHN0YXR1c19j b21tYW5kID0gWydnaXQnLCAnZGlmZicsICctLW5hbWUtc3RhdHVzJywgJy0tbm8tcmVuYW1lcycs ICctLWRpZmYtZmlsdGVyPVUnXQorICAgICAgICBzdGF0dXNfY29tbWFuZCA9IFtzZWxmLmV4ZWN1 dGFibGVfbmFtZSwgJ2RpZmYnLCAnLS1uYW1lLXN0YXR1cycsICctLW5vLXJlbmFtZXMnLCAnLS1k aWZmLWZpbHRlcj1VJ10KICAgICAgICAgcmV0dXJuIHNlbGYucnVuX3N0YXR1c19hbmRfZXh0cmFj dF9maWxlbmFtZXMoc3RhdHVzX2NvbW1hbmQsIHNlbGYuX3N0YXR1c19yZWdleHAoIlUiKSkKIAog ICAgIGRlZiBhZGRlZF9maWxlcyhzZWxmKToKQEAgLTI0Niw3ICsyNDgsNyBAQCBjbGFzcyBHaXQo U0NNLCBTVk5SZXBvc2l0b3J5KToKIAogICAgIGRlZiBzdm5fcmV2aXNpb24oc2VsZiwgcGF0aCk6 CiAgICAgICAgIF9sb2cuZGVidWcoJ1J1bm5pbmcgZ2l0LmhlYWRfc3ZuX3JldmlzaW9uLi4uIChU ZW1wb3JhcnkgbG9nZ2luZyBtZXNzYWdlKScpCi0gICAgICAgIGdpdF9sb2cgPSBzZWxmLnJ1bihb J2dpdCcsICdsb2cnLCAnLTI1JywgcGF0aF0pCisgICAgICAgIGdpdF9sb2cgPSBzZWxmLnJ1bihb c2VsZi5leGVjdXRhYmxlX25hbWUsICdsb2cnLCAnLTI1JywgcGF0aF0pCiAgICAgICAgIG1hdGNo ID0gcmUuc2VhcmNoKCJeXHMqZ2l0LXN2bi1pZDouKkAoP1A8c3ZuX3JldmlzaW9uPlxkKylcICIs IGdpdF9sb2csIHJlLk1VTFRJTElORSkKICAgICAgICAgaWYgbm90IG1hdGNoOgogICAgICAgICAg ICAgcmV0dXJuICIiCkBAIC0yNzIsMTQgKzI3NCwxNCBAQCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBv c2l0b3J5KToKICAgICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMob3JkZXJfZmlsZSk6 CiAgICAgICAgICAgICBvcmRlciA9ICItTyVzIiAlIG9yZGVyX2ZpbGUKIAotICAgICAgICBjb21t YW5kID0gWydnaXQnLCAnZGlmZicsICctLWJpbmFyeScsICItLW5vLWV4dC1kaWZmIiwgIi0tZnVs bC1pbmRleCIsICItLW5vLXJlbmFtZXMiLCBvcmRlciwgc2VsZi5tZXJnZV9iYXNlKGdpdF9jb21t aXQpLCAiLS0iXQorICAgICAgICBjb21tYW5kID0gW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnZGlm ZicsICctLWJpbmFyeScsICItLW5vLWV4dC1kaWZmIiwgIi0tZnVsbC1pbmRleCIsICItLW5vLXJl bmFtZXMiLCBvcmRlciwgc2VsZi5tZXJnZV9iYXNlKGdpdF9jb21taXQpLCAiLS0iXQogICAgICAg ICBpZiBjaGFuZ2VkX2ZpbGVzOgogICAgICAgICAgICAgY29tbWFuZCArPSBjaGFuZ2VkX2ZpbGVz CiAgICAgICAgIHJldHVybiBzZWxmLnByZXBlbmRfc3ZuX3JldmlzaW9uKHNlbGYucnVuKGNvbW1h bmQsIGRlY29kZV9vdXRwdXQ9RmFsc2UsIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpKQogCiAgICAg ZGVmIF9ydW5fZ2l0X3N2bl9maW5kX3JldihzZWxmLCBhcmcpOgogICAgICAgICAjIGdpdCBzdm4g ZmluZC1yZXYgYWx3YXlzIGV4aXRzIDAsIGV2ZW4gd2hlbiB0aGUgcmV2aXNpb24gb3IgY29tbWl0 IGlzIG5vdCBmb3VuZC4KLSAgICAgICAgcmV0dXJuIHNlbGYucnVuKFsnZ2l0JywgJ3N2bicsICdm aW5kLXJldicsIGFyZ10sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpLnJzdHJpcCgpCisgICAgICAg IHJldHVybiBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdzdm4nLCAnZmluZC1yZXYn LCBhcmddLCBjd2Q9c2VsZi5jaGVja291dF9yb290KS5yc3RyaXAoKQogCiAgICAgZGVmIF9zdHJp bmdfdG9faW50X29yX25vbmUoc2VsZiwgc3RyaW5nKToKICAgICAgICAgdHJ5OgpAQCAtMzAzLDIx ICszMDUsMjEgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgZGVmIGNvbnRl bnRzX2F0X3JldmlzaW9uKHNlbGYsIHBhdGgsIHJldmlzaW9uKToKICAgICAgICAgIiIiUmV0dXJu cyBhIGJ5dGUgYXJyYXkgKHN0cigpKSBjb250YWluaW5nIHRoZSBjb250ZW50cwogICAgICAgICBv ZiBwYXRoIEAgcmV2aXNpb24gaW4gdGhlIHJlcG9zaXRvcnkuIiIiCi0gICAgICAgIHJldHVybiBz ZWxmLnJ1bihbImdpdCIsICJzaG93IiwgIiVzOiVzIiAlIChzZWxmLmdpdF9jb21taXRfZnJvbV9z dm5fcmV2aXNpb24ocmV2aXNpb24pLCBwYXRoKV0sIGRlY29kZV9vdXRwdXQ9RmFsc2UpCisgICAg ICAgIHJldHVybiBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICJzaG93IiwgIiVzOiVz IiAlIChzZWxmLmdpdF9jb21taXRfZnJvbV9zdm5fcmV2aXNpb24ocmV2aXNpb24pLCBwYXRoKV0s IGRlY29kZV9vdXRwdXQ9RmFsc2UpCiAKICAgICBkZWYgZGlmZl9mb3JfcmV2aXNpb24oc2VsZiwg cmV2aXNpb24pOgogICAgICAgICBnaXRfY29tbWl0ID0gc2VsZi5naXRfY29tbWl0X2Zyb21fc3Zu X3JldmlzaW9uKHJldmlzaW9uKQogICAgICAgICByZXR1cm4gc2VsZi5jcmVhdGVfcGF0Y2goZ2l0 X2NvbW1pdCkKIAogICAgIGRlZiBkaWZmX2Zvcl9maWxlKHNlbGYsIHBhdGgsIGxvZz1Ob25lKToK LSAgICAgICAgcmV0dXJuIHNlbGYucnVuKFsnZ2l0JywgJ2RpZmYnLCAnSEVBRCcsICctLW5vLXJl bmFtZXMnLCAnLS0nLCBwYXRoXSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKKyAgICAgICAgcmV0 dXJuIHNlbGYucnVuKFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2RpZmYnLCAnSEVBRCcsICctLW5v LXJlbmFtZXMnLCAnLS0nLCBwYXRoXSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKIAogICAgIGRl ZiBzaG93X2hlYWQoc2VsZiwgcGF0aCk6Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihbJ2dpdCcs ICdzaG93JywgJ0hFQUQ6JyArIHNlbGYudG9fb2JqZWN0X25hbWUocGF0aCldLCBkZWNvZGVfb3V0 cHV0PUZhbHNlKQorICAgICAgICByZXR1cm4gc2VsZi5ydW4oW3NlbGYuZXhlY3V0YWJsZV9uYW1l LCAnc2hvdycsICdIRUFEOicgKyBzZWxmLnRvX29iamVjdF9uYW1lKHBhdGgpXSwgZGVjb2RlX291 dHB1dD1GYWxzZSkKIAogICAgIGRlZiBjb21taXR0ZXJfZW1haWxfZm9yX3JldmlzaW9uKHNlbGYs IHJldmlzaW9uKToKICAgICAgICAgZ2l0X2NvbW1pdCA9IHNlbGYuZ2l0X2NvbW1pdF9mcm9tX3N2 bl9yZXZpc2lvbihyZXZpc2lvbikKLSAgICAgICAgY29tbWl0dGVyX2VtYWlsID0gc2VsZi5ydW4o WyJnaXQiLCAibG9nIiwgIi0xIiwgIi0tcHJldHR5PWZvcm1hdDolY2UiLCBnaXRfY29tbWl0XSkK KyAgICAgICAgY29tbWl0dGVyX2VtYWlsID0gc2VsZi5ydW4oW3NlbGYuZXhlY3V0YWJsZV9uYW1l LCAibG9nIiwgIi0xIiwgIi0tcHJldHR5PWZvcm1hdDolY2UiLCBnaXRfY29tbWl0XSkKICAgICAg ICAgIyBHaXQgYWRkcyBhbiBleHRyYSBAcmVwb3NpdG9yeV9oYXNoIHRvIHRoZSBlbmQgb2YgZXZl cnkgY29tbWl0dGVyIGVtYWlsLCByZW1vdmUgaXQ6CiAgICAgICAgIHJldHVybiBjb21taXR0ZXJf ZW1haWwucnNwbGl0KCJAIiwgMSlbMF0KIApAQCAtMzI1LDEwICszMjcsMTAgQEAgY2xhc3MgR2l0 KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgICMgQXNzdW1lIHRoZSByZXZpc2lvbiBpcyBh biBzdm4gcmV2aXNpb24uCiAgICAgICAgIGdpdF9jb21taXQgPSBzZWxmLmdpdF9jb21taXRfZnJv bV9zdm5fcmV2aXNpb24ocmV2aXNpb24pCiAgICAgICAgICMgSSB0aGluayB0aGlzIHdpbGwgYWx3 YXlzIGZhaWwgZHVlIHRvIENoYW5nZUxvZ3MuCi0gICAgICAgIHNlbGYucnVuKFsnZ2l0JywgJ3Jl dmVydCcsICctLW5vLWNvbW1pdCcsIGdpdF9jb21taXRdLCBlcnJvcl9oYW5kbGVyPUV4ZWN1dGl2 ZS5pZ25vcmVfZXJyb3IpCisgICAgICAgIHNlbGYucnVuKFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwg J3JldmVydCcsICctLW5vLWNvbW1pdCcsIGdpdF9jb21taXRdLCBlcnJvcl9oYW5kbGVyPUV4ZWN1 dGl2ZS5pZ25vcmVfZXJyb3IpCiAKICAgICBkZWYgcmV2ZXJ0X2ZpbGVzKHNlbGYsIGZpbGVfcGF0 aHMpOgotICAgICAgICBzZWxmLnJ1bihbJ2dpdCcsICdjaGVja291dCcsICdIRUFEJ10gKyBmaWxl X3BhdGhzKQorICAgICAgICBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdjaGVja291 dCcsICdIRUFEJ10gKyBmaWxlX3BhdGhzKQogCiAgICAgZGVmIF9hc3NlcnRfY2FuX3NxdWFzaChz ZWxmLCB3b3JraW5nX2RpcmVjdG9yeV9pc19jbGVhbik6CiAgICAgICAgIHNxdWFzaCA9IEdpdC5y ZWFkX2dpdF9jb25maWcoJ3dlYmtpdC1wYXRjaC5jb21taXQtc2hvdWxkLWFsd2F5cy1zcXVhc2gn LCBjd2Q9c2VsZi5jaGVja291dF9yb290KQpAQCAtMzYyLDcgKzM2NCw3IEBAIGNsYXNzIEdpdChT Q00sIFNWTlJlcG9zaXRvcnkpOgogCiAgICAgICAgIGlmIG5vdCBmb3JjZV9zcXVhc2g6CiAgICAg ICAgICAgICBzZWxmLl9hc3NlcnRfY2FuX3NxdWFzaCh3b3JraW5nX2RpcmVjdG9yeV9pc19jbGVh bikKLSAgICAgICAgc2VsZi5ydW4oWydnaXQnLCAncmVzZXQnLCAnLS1zb2Z0Jywgc2VsZi5yZW1v dGVfbWVyZ2VfYmFzZSgpXSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKKyAgICAgICAgc2VsZi5y dW4oW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAncmVzZXQnLCAnLS1zb2Z0Jywgc2VsZi5yZW1vdGVf bWVyZ2VfYmFzZSgpXSwgY3dkPXNlbGYuY2hlY2tvdXRfcm9vdCkKICAgICAgICAgc2VsZi5jb21t aXRfbG9jYWxseV93aXRoX21lc3NhZ2UobWVzc2FnZSkKICAgICAgICAgcmV0dXJuIHNlbGYucHVz aF9sb2NhbF9jb21taXRzX3RvX3NlcnZlcih1c2VybmFtZT11c2VybmFtZSwgcGFzc3dvcmQ9cGFz c3dvcmQpCiAKQEAgLTM4NSwxNiArMzg3LDE2IEBAIGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRv cnkpOgogICAgICAgICAjIFdlIHdyYXAgaW4gYSB0cnkuLi5maW5hbGx5IGJsb2NrIHNvIGlmIGFu eXRoaW5nIGdvZXMgd3JvbmcsIHdlIGNsZWFuIHVwIHRoZSBicmFuY2hlcy4KICAgICAgICAgY29t bWl0X3N1Y2NlZWRlZCA9IFRydWUKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2VsZi5ydW4o WydnaXQnLCAnY2hlY2tvdXQnLCAnLXEnLCAnLWInLCBNRVJHRV9CUkFOQ0hfTkFNRSwgc2VsZi5y ZW1vdGVfYnJhbmNoX3JlZigpXSkKKyAgICAgICAgICAgIHNlbGYucnVuKFtzZWxmLmV4ZWN1dGFi bGVfbmFtZSwgJ2NoZWNrb3V0JywgJy1xJywgJy1iJywgTUVSR0VfQlJBTkNIX05BTUUsIHNlbGYu cmVtb3RlX2JyYW5jaF9yZWYoKV0pCiAKICAgICAgICAgICAgIGZvciBjb21taXQgaW4gY29tbWl0 X2lkczoKICAgICAgICAgICAgICAgICAjIFdlJ3JlIG9uIGEgZGlmZmVyZW50IGJyYW5jaCBub3cs IHNvIGNvbnZlcnQgImhlYWQiIHRvIHRoZSBicmFuY2ggbmFtZS4KICAgICAgICAgICAgICAgICBj b21taXQgPSByZS5zdWIocicoP2kpaGVhZCcsIGJyYW5jaF9uYW1lLCBjb21taXQpCiAgICAgICAg ICAgICAgICAgIyBGSVhNRTogT25jZSBjaGFuZ2VkX2ZpbGVzIGFuZCBjcmVhdGVfcGF0Y2ggYXJl IG1vZGlmaWVkIHRvIHNlcGFyYXRlbHkgaGFuZGxlIGVhY2gKICAgICAgICAgICAgICAgICAjIGNv bW1pdCBpbiBhIGNvbW1pdCByYW5nZSwgY29tbWl0IGVhY2ggY2hlcnJ5IHBpY2sgc28gdGhleSds bCBnZXQgZGNvbW1pdHRlZCBzZXBhcmF0ZWx5LgotICAgICAgICAgICAgICAgIHNlbGYucnVuKFsn Z2l0JywgJ2NoZXJyeS1waWNrJywgJy0tbm8tY29tbWl0JywgY29tbWl0XSkKKyAgICAgICAgICAg ICAgICBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdjaGVycnktcGljaycsICctLW5v LWNvbW1pdCcsIGNvbW1pdF0pCiAKLSAgICAgICAgICAgIHNlbGYucnVuKFsnZ2l0JywgJ2NvbW1p dCcsICctbScsIG1lc3NhZ2VdKQorICAgICAgICAgICAgc2VsZi5ydW4oW3NlbGYuZXhlY3V0YWJs ZV9uYW1lLCAnY29tbWl0JywgJy1tJywgbWVzc2FnZV0pCiAgICAgICAgICAgICBvdXRwdXQgPSBz ZWxmLnB1c2hfbG9jYWxfY29tbWl0c190b19zZXJ2ZXIodXNlcm5hbWU9dXNlcm5hbWUsIHBhc3N3 b3JkPXBhc3N3b3JkKQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlOgogICAgICAgICAgICAg bG9nKCJDT01NSVQgRkFJTEVEOiAiICsgc3RyKGUpKQpAQCAtNDAzLDMxICs0MDUsMzEgQEAgY2xh c3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIGZpbmFsbHk6CiAgICAgICAgICAg ICAjIEFuZCB0aGVuIHN3YXAgYmFjayB0byB0aGUgb3JpZ2luYWwgYnJhbmNoIGFuZCBjbGVhbiB1 cC4KICAgICAgICAgICAgIHNlbGYuY2xlYW5fd29ya2luZ19kaXJlY3RvcnkoKQotICAgICAgICAg ICAgc2VsZi5ydW4oWydnaXQnLCAnY2hlY2tvdXQnLCAnLXEnLCBicmFuY2hfbmFtZV0pCisgICAg ICAgICAgICBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdjaGVja291dCcsICctcScs IGJyYW5jaF9uYW1lXSkKICAgICAgICAgICAgIHNlbGYuZGVsZXRlX2JyYW5jaChNRVJHRV9CUkFO Q0hfTkFNRSkKIAogICAgICAgICByZXR1cm4gb3V0cHV0CiAKICAgICBkZWYgc3ZuX2NvbW1pdF9s b2coc2VsZiwgc3ZuX3JldmlzaW9uKToKICAgICAgICAgc3ZuX3JldmlzaW9uID0gc2VsZi5zdHJp cF9yX2Zyb21fc3ZuX3JldmlzaW9uKHN2bl9yZXZpc2lvbikKLSAgICAgICAgcmV0dXJuIHNlbGYu cnVuKFsnZ2l0JywgJ3N2bicsICdsb2cnLCAnLXInLCBzdm5fcmV2aXNpb25dKQorICAgICAgICBy ZXR1cm4gc2VsZi5ydW4oW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnc3ZuJywgJ2xvZycsICctcics IHN2bl9yZXZpc2lvbl0pCiAKICAgICBkZWYgbGFzdF9zdm5fY29tbWl0X2xvZyhzZWxmKToKLSAg ICAgICAgcmV0dXJuIHNlbGYucnVuKFsnZ2l0JywgJ3N2bicsICdsb2cnLCAnLS1saW1pdD0xJ10p CisgICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdzdm4nLCAn bG9nJywgJy0tbGltaXQ9MSddKQogCiAgICAgZGVmIHN2bl9ibGFtZShzZWxmLCBwYXRoKToKLSAg ICAgICAgcmV0dXJuIHNlbGYucnVuKFsnZ2l0JywgJ3N2bicsICdibGFtZScsIHBhdGhdKQorICAg ICAgICByZXR1cm4gc2VsZi5ydW4oW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnc3ZuJywgJ2JsYW1l JywgcGF0aF0pCiAKICAgICAjIEdpdC1zcGVjaWZpYyBtZXRob2RzOgogICAgIGRlZiBfYnJhbmNo X3JlZl9leGlzdHMoc2VsZiwgYnJhbmNoX3JlZik6Ci0gICAgICAgIHJldHVybiBzZWxmLnJ1bihb J2dpdCcsICdzaG93LXJlZicsICctLXF1aWV0JywgJy0tdmVyaWZ5JywgYnJhbmNoX3JlZl0sIHJl dHVybl9leGl0X2NvZGU9VHJ1ZSkgPT0gMAorICAgICAgICByZXR1cm4gc2VsZi5ydW4oW3NlbGYu ZXhlY3V0YWJsZV9uYW1lLCAnc2hvdy1yZWYnLCAnLS1xdWlldCcsICctLXZlcmlmeScsIGJyYW5j aF9yZWZdLCByZXR1cm5fZXhpdF9jb2RlPVRydWUpID09IDAKIAogICAgIGRlZiBkZWxldGVfYnJh bmNoKHNlbGYsIGJyYW5jaF9uYW1lKToKICAgICAgICAgaWYgc2VsZi5fYnJhbmNoX3JlZl9leGlz dHMoJ3JlZnMvaGVhZHMvJyArIGJyYW5jaF9uYW1lKToKLSAgICAgICAgICAgIHNlbGYucnVuKFsn Z2l0JywgJ2JyYW5jaCcsICctRCcsIGJyYW5jaF9uYW1lXSkKKyAgICAgICAgICAgIHNlbGYucnVu KFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ2JyYW5jaCcsICctRCcsIGJyYW5jaF9uYW1lXSkKIAog ICAgIGRlZiByZW1vdGVfbWVyZ2VfYmFzZShzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYucnVu KFsnZ2l0JywgJ21lcmdlLWJhc2UnLCBzZWxmLnJlbW90ZV9icmFuY2hfcmVmKCksICdIRUFEJ10s IGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpLnN0cmlwKCkKKyAgICAgICAgcmV0dXJuIHNlbGYucnVu KFtzZWxmLmV4ZWN1dGFibGVfbmFtZSwgJ21lcmdlLWJhc2UnLCBzZWxmLnJlbW90ZV9icmFuY2hf cmVmKCksICdIRUFEJ10sIGN3ZD1zZWxmLmNoZWNrb3V0X3Jvb3QpLnN0cmlwKCkKIAogICAgIGRl ZiByZW1vdGVfYnJhbmNoX3JlZihzZWxmKToKICAgICAgICAgIyBVc2UgcmVmZXJlbmNlcyBzbyB0 aGF0IHdlIGNhbiBhdm9pZCBjb2xsaXNpb25zLCBlLmcuIHdlIGRvbid0IHdhbnQgdG8gb3BlcmF0 ZSBvbiByZWZzL2hlYWRzL3RydW5rIGlmIGl0IGV4aXN0cy4KQEAgLTQ0NCwxMCArNDQ2LDEwIEBA IGNsYXNzIEdpdChTQ00sIFNWTlJlcG9zaXRvcnkpOgogICAgICAgICByZXR1cm4gZmlyc3RfcmVt b3RlX2JyYW5jaF9yZWYuc3BsaXQoJzonKVsxXQogCiAgICAgZGVmIGNvbW1pdF9sb2NhbGx5X3dp dGhfbWVzc2FnZShzZWxmLCBtZXNzYWdlKToKLSAgICAgICAgc2VsZi5ydW4oWydnaXQnLCAnY29t bWl0JywgJy0tYWxsJywgJy1GJywgJy0nXSwgaW5wdXQ9bWVzc2FnZSwgY3dkPXNlbGYuY2hlY2tv dXRfcm9vdCkKKyAgICAgICAgc2VsZi5ydW4oW3NlbGYuZXhlY3V0YWJsZV9uYW1lLCAnY29tbWl0 JywgJy0tYWxsJywgJy1GJywgJy0nXSwgaW5wdXQ9bWVzc2FnZSwgY3dkPXNlbGYuY2hlY2tvdXRf cm9vdCkKIAogICAgIGRlZiBwdXNoX2xvY2FsX2NvbW1pdHNfdG9fc2VydmVyKHNlbGYsIHVzZXJu YW1lPU5vbmUsIHBhc3N3b3JkPU5vbmUpOgotICAgICAgICBkY29tbWl0X2NvbW1hbmQgPSBbJ2dp dCcsICdzdm4nLCAnZGNvbW1pdCddCisgICAgICAgIGRjb21taXRfY29tbWFuZCA9IFtzZWxmLmV4 ZWN1dGFibGVfbmFtZSwgJ3N2bicsICdkY29tbWl0J10KICAgICAgICAgaWYgKG5vdCB1c2VybmFt ZSBvciBub3QgcGFzc3dvcmQpIGFuZCBub3Qgc2VsZi5oYXNfYXV0aG9yaXphdGlvbl9mb3JfcmVh bG0oU1ZOLnN2bl9zZXJ2ZXJfcmVhbG0pOgogICAgICAgICAgICAgcmFpc2UgQXV0aGVudGljYXRp b25FcnJvcihTVk4uc3ZuX3NlcnZlcl9ob3N0LCBwcm9tcHRfZm9yX3Bhc3N3b3JkPVRydWUpCiAg ICAgICAgIGlmIHVzZXJuYW1lOgpAQCAtNDY5LDE0ICs0NzEsMTQgQEAgY2xhc3MgR2l0KFNDTSwg U1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgICAgICBpZiAnLi4uJyBpbiBjb21taXRpc2g6CiAgICAg ICAgICAgICAgICAgcmFpc2UgU2NyaXB0RXJyb3IobWVzc2FnZT0iJy4uLicgaXMgbm90IHN1cHBv cnRlZCAoZm91bmQgaW4gJyVzJykuIERpZCB5b3UgbWVhbiAnLi4nPyIgJSBjb21taXRpc2gpCiAg ICAgICAgICAgICBlbGlmICcuLicgaW4gY29tbWl0aXNoOgotICAgICAgICAgICAgICAgIGNvbW1p dF9pZHMgKz0gcmV2ZXJzZWQoc2VsZi5ydW4oWydnaXQnLCAncmV2LWxpc3QnLCBjb21taXRpc2hd KS5zcGxpdGxpbmVzKCkpCisgICAgICAgICAgICAgICAgY29tbWl0X2lkcyArPSByZXZlcnNlZChz ZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdyZXYtbGlzdCcsIGNvbW1pdGlzaF0pLnNw bGl0bGluZXMoKSkKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgIyBUdXJuIHNp bmdsZSBjb21taXRzIG9yIGJyYW5jaCBvciB0YWcgbmFtZXMgaW50byBjb21taXQgaWRzLgotICAg ICAgICAgICAgICAgIGNvbW1pdF9pZHMgKz0gc2VsZi5ydW4oWydnaXQnLCAncmV2LXBhcnNlJywg Jy0tcmV2cy1vbmx5JywgY29tbWl0aXNoXSkuc3BsaXRsaW5lcygpCisgICAgICAgICAgICAgICAg Y29tbWl0X2lkcyArPSBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdyZXYtcGFyc2Un LCAnLS1yZXZzLW9ubHknLCBjb21taXRpc2hdKS5zcGxpdGxpbmVzKCkKICAgICAgICAgcmV0dXJu IGNvbW1pdF9pZHMKIAogICAgIGRlZiBjb21taXRfbWVzc2FnZV9mb3JfbG9jYWxfY29tbWl0KHNl bGYsIGNvbW1pdF9pZCk6Ci0gICAgICAgIGNvbW1pdF9saW5lcyA9IHNlbGYucnVuKFsnZ2l0Jywg J2NhdC1maWxlJywgJ2NvbW1pdCcsIGNvbW1pdF9pZF0pLnNwbGl0bGluZXMoKQorICAgICAgICBj b21taXRfbGluZXMgPSBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdjYXQtZmlsZScs ICdjb21taXQnLCBjb21taXRfaWRdKS5zcGxpdGxpbmVzKCkKIAogICAgICAgICAjIFNraXAgdGhl IGdpdCBoZWFkZXJzLgogICAgICAgICBmaXJzdF9saW5lX2FmdGVyX2hlYWRlcnMgPSAwCkBAIC00 ODcsNCArNDg5LDQgQEAgY2xhc3MgR2l0KFNDTSwgU1ZOUmVwb3NpdG9yeSk6CiAgICAgICAgIHJl dHVybiBDb21taXRNZXNzYWdlKGNvbW1pdF9saW5lc1tmaXJzdF9saW5lX2FmdGVyX2hlYWRlcnM6 XSkKIAogICAgIGRlZiBmaWxlc19jaGFuZ2VkX3N1bW1hcnlfZm9yX2NvbW1pdChzZWxmLCBjb21t aXRfaWQpOgotICAgICAgICByZXR1cm4gc2VsZi5ydW4oWydnaXQnLCAnZGlmZi10cmVlJywgJy0t c2hvcnRzdGF0JywgJy0tbm8tcmVuYW1lcycsICctLW5vLWNvbW1pdC1pZCcsIGNvbW1pdF9pZF0p CisgICAgICAgIHJldHVybiBzZWxmLnJ1bihbc2VsZi5leGVjdXRhYmxlX25hbWUsICdkaWZmLXRy ZWUnLCAnLS1zaG9ydHN0YXQnLCAnLS1uby1yZW5hbWVzJywgJy0tbm8tY29tbWl0LWlkJywgY29t bWl0X2lkXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2hvc3Qu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9ob3N0LnB5CmluZGV4IGZmYzEzYmY5 ODY4MzkxZDRiOWQ3NDUxOWNjYzUxNTQ2ZjBlZTgwZGEuLjA4MzEyMDIyN2JlNjAyMDBmYmVlODky YmUwMjA0MzYzYjVjMmE1MjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL2hvc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vaG9zdC5weQpA QCAtMTA0LDYgKzEwNCwyNiBAQCBjbGFzcyBIb3N0KFN5c3RlbUhvc3QpOgogICAgICAgICAgICAg ICAgIFNWTi5leGVjdXRhYmxlX25hbWUgPSAnc3ZuLmJhdCcKICAgICAgICAgICAgIGV4Y2VwdCBP U0Vycm9yLCBlOgogICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoJ0ZhaWxlZCB0byBlbmdhZ2Ug c3ZuLmJhdCBXaW5kb3dzIGhhY2suJykKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5l eGVjdXRpdmUucnVuX2NvbW1hbmQoWydnaXQnLCAnaGVscCddKQorICAgICAgICBleGNlcHQgT1NF cnJvciwgZToKKyAgICAgICAgICAgIHRyeToKKyAgICAgICAgICAgICAgICBzZWxmLmV4ZWN1dGl2 ZS5ydW5fY29tbWFuZChbJ2dpdC5iYXQnLCAnaGVscCddKQorICAgICAgICAgICAgICAgICMgQ2hy b21pdW0gV2luIHVzZXMgdGhlIGRlcG90X3Rvb2xzIHBhY2thZ2UsIHdoaWNoIGNvbnRhaW5zIGEg bnVtYmVyCisgICAgICAgICAgICAgICAgIyBvZiBkZXZlbG9wbWVudCB0b29scywgaW5jbHVkaW5n IFB5dGhvbiBhbmQgZ2l0LiBJbnN0ZWFkIG9mIHVzaW5nIGEKKyAgICAgICAgICAgICAgICAjIHJl YWwgZ2l0IGV4ZWN1dGFibGUsIGRlcG90X3Rvb2xzIGluZGlyZWN0cyB2aWEgYSBiYXRjaCBmaWxl LCBjYWxsZWQKKyAgICAgICAgICAgICAgICAjIGdpdC5iYXQuIFRoaXMgYmF0Y2ggZmlsZSBhbGxv d3MgZGVwb3RfdG9vbHMgdG8gYXV0by11cGRhdGUgdGhlIHJlYWwKKyAgICAgICAgICAgICAgICAj IGdpdCBleGVjdXRhYmxlLCB3aGljaCBpcyBjb250YWluZWQgaW4gYSBzdWJkaXJlY3RvcnkuCisg ICAgICAgICAgICAgICAgIworICAgICAgICAgICAgICAgICMgVGhhdCdzIGFsbCBmaW5lIGFuZCBn b29kLCBleGNlcHQgdGhhdCBzdWJwcm9jZXNzLnBvcGVuIGNhbiBkZXRlY3QKKyAgICAgICAgICAg ICAgICAjIHRoZSBkaWZmZXJlbmNlIGJldHdlZW4gYSByZWFsIGdpdCBleGVjdXRhYmxlIGFuZCBi YXRjaCBmaWxlIHdoZW4gd2UKKyAgICAgICAgICAgICAgICAjIGRvbid0IHByb3ZpZGUgdXNlIHNo ZWxsPVRydWUuIFJhdGhlciB0aGFuIHVzZSBzaGVsbD1UcnVlIG9uIFdpbmRvd3MsCisgICAgICAg ICAgICAgICAgIyBXZSBoYWNrIHRoZSBnaXQuYmF0IG5hbWUgaW50byB0aGUgU1ZOIGNsYXNzLgor ICAgICAgICAgICAgICAgIF9sb2cuZGVidWcoJ0VuZ2FnaW5nIGdpdC5iYXQgV2luZG93cyBoYWNr LicpCisgICAgICAgICAgICAgICAgZnJvbSB3ZWJraXRweS5jb21tb24uY2hlY2tvdXQuc2NtLmdp dCBpbXBvcnQgR2l0CisgICAgICAgICAgICAgICAgR2l0LmV4ZWN1dGFibGVfbmFtZSA9ICdnaXQu YmF0JworICAgICAgICAgICAgZXhjZXB0IE9TRXJyb3IsIGU6CisgICAgICAgICAgICAgICAgX2xv Zy5kZWJ1ZygnRmFpbGVkIHRvIGVuZ2FnZSBnaXQuYmF0IFdpbmRvd3MgaGFjay4nKQogCiAgICAg ZGVmIF9pbml0aWFsaXplX3NjbShzZWxmLCBwYXRjaF9kaXJlY3Rvcmllcz1Ob25lKToKICAgICAg ICAgaWYgc3lzLnBsYXRmb3JtID09ICJ3aW4zMiI6Cg==