88702 2012-06-08 23:54:52 -0700 [NRWT] Would like an output mode similar to ORWT verbose one 2012-08-07 22:32:42 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED NRWT P2 Normal --- 93434 88680 92432 1 ap dpranke abarth dpranke eric ojan ossy rniwa tony oldest_to_newest 645258 0 ap 2012-06-08 23:54:52 -0700 When investigating flaky failures, I usually do it with "old-run-webkit-tests -v". The reason is that it runs tests sequentially, and prints each test out (so I can easily see which tests ran prior to failing one, and are the likely culprits). This is more difficult with NRWT, because (in the order of decreasing importance): 1. its verbose output is way more verbose, to the degree that it's not easy to hunt down where test list is. 2. Retrying failing tests wastes time, and further confuses output. 3. Need to pass extra options (--num-processes) is understandable, but inconvenient nonetheless. 645433 1 dpranke 2012-06-09 16:08:44 -0700 (In reply to comment #0) > When investigating flaky failures, I usually do it with "old-run-webkit-tests -v". The reason is that it runs tests sequentially, and prints each test out (so I can easily see which tests ran prior to failing one, and are the likely culprits). > > This is more difficult with NRWT, because (in the order of decreasing importance): > > 1. its verbose output is way more verbose, to the degree that it's not easy to hunt down where test list is. > I quite agree with this. I have been meaning to implement a simpler format for some time. I have two candidates in mind, and I'd be curious to get your feedback on them. The first is something along the lines of the difference between test-webkitpy and test-webkitpy -v. The first gives the "progress update" like you get today; the latter prints one line per test with the name of the test and passed/failed (this is also similar to how ninja's output works, and I've been meaning to converge with ninja here). The second option is more verbose: use new-run-webkit-tests --print trace-everything. That prints out the expected result (in the TestExpectations sense), the location of the baselines that will be used, the actual result, and the time the test took. I think both forms of output are useful. WDYT? > 2. Retrying failing tests wastes time, and further confuses output. You can disable this today with --no-retry-failures, in case you didn't know that. > 3. Need to pass extra options (--num-processes) is understandable, but inconvenient nonetheless. Yeah. I have no particular objection to adding another command line option that combines some or all o f these things, if that's generally useful. I personally recommend people create shell functions or aliases or other wrappers, though, since most people often find they want a particular combination of things (my most common aliases do disable retries, for example) and it's hard to please everyone without making the help even more unmanageably longer. 683752 2 dpranke 2012-07-31 19:08:38 -0700 This will actually be implemented by the patch posted to bug 92432. 686040 3 156219 dpranke 2012-08-02 17:45:42 -0700 Created attachment 156219 Patch 686048 4 156219 rniwa 2012-08-02 17:49:38 -0700 Comment on attachment 156219 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156219&action=review rubber stamp. > Tools/ChangeLog:11 > + --debug-rwt-logging to get the full debug stream (aka old ORWT > + --verbose). You mean old NRTW --verbose? 686056 5 dpranke 2012-08-02 17:54:17 -0700 (In reply to comment #4) > (From update of attachment 156219 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156219&action=review > > rubber stamp. > > > Tools/ChangeLog:11 > > + --debug-rwt-logging to get the full debug stream (aka old ORWT > > + --verbose). > > You mean old NRTW --verbose? er, right. 689741 6 157082 dpranke 2012-08-07 18:48:29 -0700 Created attachment 157082 patch for landing 689743 7 dpranke 2012-08-07 18:50:22 -0700 Committed r124967: <http://trac.webkit.org/changeset/124967> 689901 8 ossy 2012-08-07 22:32:42 -0700 (In reply to comment #7) > Committed r124967: <http://trac.webkit.org/changeset/124967> It caused a regression. See https://bugs.webkit.org/show_bug.cgi?id=93434 for details. 156219 2012-08-02 17:45:42 -0700 2012-08-07 18:48:26 -0700 Patch bug-88702-20120802174522.patch text/plain 10510 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NDc5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNWNiMWY1MDAyYzA0NjMyNzUyZTUwY2Y0NDYxZGQ2MDJi YTU4NzIzZi4uYTNiYWNhMTdmODI3ZWM0OTMwOWUyZTcyMmNlZGE5Nzg0MGNjODgyYiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMy IEBACiAyMDEyLTA4LTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIFtOUldUXSBXb3VsZCBsaWtlIGFuIG91dHB1dCBtb2RlIHNpbWlsYXIgdG8gT1JXVCB2 ZXJib3NlIG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODg3MDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDaGFuZ2UgdGhlIC0tdmVyYm9zZSBsb2dnaW5nIGZvciBuZXctcnVuLXdlYmtpdC10ZXN0cyBz byB0aGF0CisgICAgICAgIGl0IG1hdGNoZXMgT1JXVCBtb3JlOyB3ZSBqdXN0IHByaW50IG9uZSBs aW5lIHBlciB0ZXN0LiBVc2UKKyAgICAgICAgLS1kZWJ1Zy1yd3QtbG9nZ2luZyB0byBnZXQgdGhl IGZ1bGwgZGVidWcgc3RyZWFtIChha2Egb2xkIE9SV1QKKyAgICAgICAgLS12ZXJib3NlKS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVj dGF0aW9ucy5weToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnMpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgIChf c2V0X3VwX2Rlcml2ZWRfb3B0aW9ucyk6CisgICAgICAgIChwYXJzZV9hcmdzKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0 aW9udGVzdC5weToKKyAgICAgICAgKE1haW5UZXN0LnRlc3RfcmV0cnlpbmdfYW5kX2ZsYWt5X3Rl c3RzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmlu dGluZy5weToKKyAgICAgICAgKHByaW50X29wdGlvbnMpOgorICAgICAgICAoUHJpbnRlci5fcHJp bnRfcmVzdWx0X3N1bW1hcnlfZW50cnkpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfb25lX2xp bmVfc3VtbWFyeSk6CisgICAgICAgIChQcmludGVyLl9wcmludF90ZXN0X3Jlc3VsdCk6CisgICAg ICAgIChQcmludGVyLl9wcmludF9iYXNlbGluZSk6CisgICAgICAgIChQcmludGVyLl9wcmludF91 bmV4cGVjdGVkX3Jlc3VsdHMpOgorCisyMDEyLTA4LTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VA Y2hyb21pdW0ub3JnPgorCiAgICAgICAgIG5yd3Q6IGNsZWFuIHVwIHByaW50aW5nLnB5CiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzAyNgogCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9l eHBlY3RhdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2Rl bHMvdGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggOGVlODdiM2M3ZDA4ZDUyOTUyZTAyMGE0OTNm Yzc0MTM2N2Y1ZjA4Yi4uOTY1MTUxODYzYjdjOTFlZjAxNzc5NTY1M2RkMWNmNThjNGI5MWUyNCAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rl c3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAtNjkwLDE4ICs2OTAsMTYgQEAgY2xh c3MgVGVzdEV4cGVjdGF0aW9ucyhvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICAnY3Jhc2gn OiBDUkFTSCwKICAgICAgICAgICAgICAgICAgICAgJ21pc3NpbmcnOiBNSVNTSU5HfQogCi0gICAg RVhQRUNUQVRJT05fREVTQ1JJUFRJT05TID0ge1NLSVA6ICgnc2tpcHBlZCcsICdza2lwcGVkJyks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBBU1M6ICgncGFzcycsICdwYXNzZXMn KSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVEVYVDogKCd0ZXh0IGRpZmYgbWlz bWF0Y2gnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3RleHQgZGlm ZiBtaXNtYXRjaCcpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJTUFHRTogKCdp bWFnZSBtaXNtYXRjaCcsICdpbWFnZSBtaXNtYXRjaCcpLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBJTUFHRV9QTFVTX1RFWFQ6ICgnaW1hZ2UgYW5kIHRleHQgbWlzbWF0Y2gnLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnaW1hZ2Ug YW5kIHRleHQgbWlzbWF0Y2gnKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQVVE SU86ICgnYXVkaW8gbWlzbWF0Y2gnLCAnYXVkaW8gbWlzbWF0Y2gnKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgQ1JBU0g6ICgnY3Jhc2gnLCAnY3Jhc2hlcycpLAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBUSU1FT1VUOiAoJ3Rlc3QgdGltZWQgb3V0JywgJ3Rlc3Rz IHRpbWVkIG91dCcpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNSVNTSU5HOiAo J25vIGV4cGVjdGVkIHJlc3VsdCBmb3VuZCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnbm8gZXhwZWN0ZWQgcmVzdWx0cyBmb3VuZCcpfQorICAgICMgKGFnZ3Jl Z2F0ZWQgYnkgY2F0ZWdvcnksIHBhc3MvZmFpbC9za2lwLCB0eXBlKQorICAgIEVYUEVDVEFUSU9O X0RFU0NSSVBUSU9OUyA9IHtTS0lQOiAoJ3NraXBwZWQnLCAnc2tpcHBlZCcsICcnKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgUEFTUzogKCdwYXNzZXMnLCAncGFzc2VkJywgJycp LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBURVhUOiAoJ3RleHQgZmFpbHVyZXMn LCAnZmFpbGVkJywgJyAodGV4dCBkaWZmKScpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBJTUFHRTogKCdpbWFnZS1vbmx5IGZhaWx1cmVzJywgJ2ZhaWxlZCcsICcgKGltYWdlIGRp ZmYpJyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIElNQUdFX1BMVVNfVEVYVDog KCdib3RoIGltYWdlIGFuZCB0ZXh0IGZhaWx1cmVzJywgJ2ZhaWxlZCcsICcgKGJvdGggaW1hZ2Ug YW5kIHRleHQgZGlmZnMnKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQVVESU86 ICgnYXVkaW8gZmFpbHVyZXMnLCAnZmFpbGVkJywgJyAoYXVkaW8gZGlmZiknKSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQ1JBU0g6ICgnY3Jhc2hlcycsICdjcmFzaGVkJywgJycp LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUSU1FT1VUOiAoJ3RpbWVvdXRzJywg J3RpbWVkIG91dCcsICcnKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTUlTU0lO RzogKCdtaXNzaW5nIHJlc3VsdHMnLCAnaXMgbWlzc2luZyBhbiBleHBlY3RlZCByZXN1bHQnLCAn Jyl9CiAKICAgICBFWFBFQ1RBVElPTl9PUkRFUiA9IChQQVNTLCBDUkFTSCwgVElNRU9VVCwgTUlT U0lORywgSU1BR0VfUExVU19URVhULCBURVhULCBJTUFHRSwgQVVESU8sIFNLSVApCiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVz dHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rl c3RzLnB5CmluZGV4IGI2ODQyYmQ0MjhmOGZiNWZjOWQ1YWJlYWQxNmNlMjcyYTNmYjFiYTMuLmE0 MjQ2MjEwMDUwYjAxODE3NWVlOTZiNWNiYzA3Y2Y0MDY0OTZiZmEgMTAwNzU1Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpA QCAtMTc3LDYgKzE3Nyw5IEBAIGRlZiBfc2V0X3VwX2Rlcml2ZWRfb3B0aW9ucyhwb3J0LCBvcHRp b25zKToKIAogICAgICAgICBvcHRpb25zLnBpeGVsX3Rlc3RfZGlyZWN0b3JpZXMgPSBsaXN0KHZh cmlmaWVkX2RpcnMpCiAKKyAgICBpZiBvcHRpb25zLnJ1bl9zaW5nbHk6CisgICAgICAgIG9wdGlv bnMudmVyYm9zZSA9IFRydWUKKwogICAgIHJldHVybiB3YXJuaW5ncwogCiAKQEAgLTM4OCw5ICsz OTEsOCBAQCBkZWYgcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogICAgICAgICBvcHRwYXJzZS5tYWtl X29wdGlvbigiLS1iYXRjaC1zaXplIiwKICAgICAgICAgICAgIGhlbHA9KCJSdW4gYSB0aGUgdGVz dHMgaW4gYmF0Y2hlcyAobiksIGFmdGVyIGV2ZXJ5IG4gdGVzdHMsICIKICAgICAgICAgICAgICAg ICAgICJEdW1wUmVuZGVyVHJlZSBpcyByZWxhdW5jaGVkLiIpLCB0eXBlPSJpbnQiLCBkZWZhdWx0 PU5vbmUpLAotICAgICAgICAjIG9sZC1ydW4td2Via2l0LXRlc3RzIGhhcyAtLXJ1bi1zaW5nbHkg aW1wbHkgLS12ZXJib3NlLgogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1ydW4tc2lu Z2x5IiwgYWN0aW9uPSJzdG9yZV90cnVlIiwKLSAgICAgICAgICAgIGRlZmF1bHQ9RmFsc2UsIGhl bHA9InJ1biBhIHNlcGFyYXRlIER1bXBSZW5kZXJUcmVlIGZvciBlYWNoIHRlc3QiKSwKKyAgICAg ICAgICAgIGRlZmF1bHQ9RmFsc2UsIGhlbHA9InJ1biBhIHNlcGFyYXRlIER1bXBSZW5kZXJUcmVl IGZvciBlYWNoIHRlc3QgKGltcGxpZXMgLS12ZXJib3NlKSIpLAogICAgICAgICBvcHRwYXJzZS5t YWtlX29wdGlvbigiLS1jaGlsZC1wcm9jZXNzZXMiLAogICAgICAgICAgICAgaGVscD0iTnVtYmVy IG9mIER1bXBSZW5kZXJUcmVlcyB0byBydW4gaW4gcGFyYWxsZWwuIiksCiAgICAgICAgICMgRklY TUU6IERpc3BsYXkgZGVmYXVsdCBudW1iZXIgb2YgY2hpbGQgcHJvY2Vzc2VzIHRoYXQgd2lsbCBy dW4uCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CmluZGV4IDE2 MmEwNzk1M2Y2YTBjMmYxMzgyOTYzYjAwY2RlNTcyYjNmMWE3NmIuLjYxYTUyMjc1ZGNhNTgwMjlj Yjc2ZWY0MGY0ODY4NDQxMTZhNzNlYmIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50 ZWdyYXRpb250ZXN0LnB5CkBAIC03NjQsNyArNzY0LDcgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRl c3QuVGVzdENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWxzKHJlcywgMSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdDbG9iYmVyaW5nIG9sZCByZXN1 bHRzJyBpbiBlcnIuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdmbGFreS90 ZXh0Lmh0bWwnIGluIGVyci5nZXR2YWx1ZSgpKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3Vu ZXhwZWN0ZWQgdGV4dCBkaWZmJyBpbiBvdXQuZ2V0dmFsdWUoKSkKKyAgICAgICAgc2VsZi5hc3Nl cnRUcnVlKCd1bmV4cGVjdGVkIHRleHQgZmFpbHVyZXMnIGluIG91dC5nZXR2YWx1ZSgpKQogICAg ICAgICBzZWxmLmFzc2VydEZhbHNlKCd1bmV4cGVjdGVkIGZsYWtpbmVzcycgaW4gb3V0LmdldHZh bHVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShob3N0LmZpbGVzeXN0ZW0uZXhpc3RzKCcv dG1wL2xheW91dC10ZXN0LXJlc3VsdHMvZmFpbHVyZXMvZmxha3kvdGV4dC1hY3R1YWwudHh0Jykp CiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoaG9zdC5maWxlc3lzdGVtLmV4aXN0cygncmV0cmll cycpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmll d3MvcHJpbnRpbmcucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3 cy9wcmludGluZy5weQppbmRleCA1OTNjNWUyZThjMTJiMDE2MTk0Mjc0ZTdkZmU5ZDZkZmYzOGQ0 OTc1Li41NWUzM2EzOGM1MjUzYTc2MzhjMmMxMzY2ZjA4MTVmMDdmMzI3MjM5IDEwMDY0NAotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5w eQpAQCAtNDYsOCArNDYsOCBAQCBkZWYgcHJpbnRfb3B0aW9ucygpOgogICAgIHJldHVybiBbCiAg ICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCctcScsICctLXF1aWV0JywgYWN0aW9uPSdzdG9y ZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVs cD0ncnVuIHF1aWV0bHkgKGVycm9ycywgd2FybmluZ3MsIGFuZCBwcm9ncmVzcyBvbmx5KScpLAot ICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbignLXYnLCAnLS12ZXJib3NlJywgYWN0aW9uPSdz dG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwgZGVzdD0nZGVidWdfcnd0X2xvZ2dpbmcnLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBoZWxwPSdzYW1lIGFzIC0tZGVidWctcnd0LWxvZ2dp bmcgKGZvciBub3cpJyksCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCctdicsICctLXZl cmJvc2UnLCBhY3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBoZWxwPSdwcmludCBhIHN1bW1hcml6ZWQgcmVzdWx0IGZvciBldmVy eSB0ZXN0IChvbmUgbGluZSBwZXIgdGVzdCknKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRp b24oJy0tZGV0YWlscycsIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2UsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J3ByaW50IGRldGFpbGVkIHJlc3VsdHMgZm9y IGV2ZXJ5IHRlc3QnKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tZGVidWctcnd0 LWxvZ2dpbmcnLCBhY3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLApAQCAtMjkzLDcg KzI5Myw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIGRlc2MgPSBUZXN0 RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OX0RFU0NSSVBUSU9OU1tyZXN1bHRdCiAgICAgICAgICAg ICBpZiBub3RfcGFzc2luZyBhbmQgbGVuKHJlc3VsdHMpOgogICAgICAgICAgICAgICAgIHBjdCA9 IGxlbihyZXN1bHRzKSAqIDEwMC4wIC8gbm90X3Bhc3NpbmcKLSAgICAgICAgICAgICAgICBzZWxm Ll9wcmludF9mb3JfYm90KCIgICU1ZCAlLTI0cyAoJTQuMWYlJSkiICUgKGxlbihyZXN1bHRzKSwg ZGVzY1tsZW4ocmVzdWx0cykgIT0gMV0sIHBjdCkpCisgICAgICAgICAgICAgICAgc2VsZi5fcHJp bnRfZm9yX2JvdCgiICAlNWQgJS0yNHMgKCU0LjFmJSUpIiAlIChsZW4ocmVzdWx0cyksIGRlc2Nb MF0sIHBjdCkpCiAKICAgICBkZWYgX3ByaW50X29uZV9saW5lX3N1bW1hcnkoc2VsZiwgdG90YWws IGV4cGVjdGVkLCB1bmV4cGVjdGVkKToKICAgICAgICAgaW5jb21wbGV0ZSA9IHRvdGFsIC0gZXhw ZWN0ZWQgLSB1bmV4cGVjdGVkCkBAIC0zMDIsNyArMzAyLDcgQEAgY2xhc3MgUHJpbnRlcihvYmpl Y3QpOgogICAgICAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgiIikKICAgICAgICAgICAgIGlu Y29tcGxldGVfc3RyID0gIiAoJWQgZGlkbid0IHJ1bikiICUgaW5jb21wbGV0ZQogCi0gICAgICAg IGlmIHNlbGYuX29wdGlvbnMuZGVidWdfcnd0X2xvZ2dpbmcgb3IgdW5leHBlY3RlZDoKKyAgICAg ICAgaWYgc2VsZi5fb3B0aW9ucy52ZXJib3NlIG9yIHNlbGYuX29wdGlvbnMuZGVidWdfcnd0X2xv Z2dpbmcgb3IgdW5leHBlY3RlZDoKICAgICAgICAgICAgIHNlbGYud3JpdGVsbigiIikKIAogICAg ICAgICBzdW1tYXJ5ID0gJycKQEAgLTMyNyw4ICszMjcsOSBAQCBjbGFzcyBQcmludGVyKG9iamVj dCk6CiAgICAgZGVmIF9wcmludF90ZXN0X3Jlc3VsdChzZWxmLCByZXN1bHQsIGV4cGVjdGVkLCBl eHBfc3RyLCBnb3Rfc3RyKToKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5kZXRhaWxzOgogICAg ICAgICAgICAgc2VsZi5fcHJpbnRfdGVzdF90cmFjZShyZXN1bHQsIGV4cF9zdHIsIGdvdF9zdHIp Ci0gICAgICAgIGVsaWYgbm90IGV4cGVjdGVkOgotICAgICAgICAgICAgc2VsZi5fcHJpbnRfdW5l eHBlY3RlZF90ZXN0X3Jlc3VsdChyZXN1bHQpCisgICAgICAgIGVsaWYgKHNlbGYuX29wdGlvbnMu dmVyYm9zZSBhbmQgbm90IHNlbGYuX29wdGlvbnMuZGVidWdfcnd0X2xvZ2dpbmcpIG9yIG5vdCBl eHBlY3RlZDoKKyAgICAgICAgICAgIGRlc2MgPSBUZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9O X0RFU0NSSVBUSU9OU1tyZXN1bHQudHlwZV0KKyAgICAgICAgICAgIHNlbGYud3JpdGVsbigiJXMg JXMlcyVzIiAlIChyZXN1bHQudGVzdF9uYW1lLCBkZXNjWzFdLCAiIiBpZiBleHBlY3RlZCBlbHNl ICIgdW5leHBlY3RlZGx5IiwgZGVzY1syXSkpCiAKICAgICBkZWYgX3ByaW50X3Rlc3RfdHJhY2Uo c2VsZiwgcmVzdWx0LCBleHBfc3RyLCBnb3Rfc3RyKToKICAgICAgICAgdGVzdF9uYW1lID0gcmVz dWx0LnRlc3RfbmFtZQpAQCAtMzU2LDEwICszNTcsNiBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6 CiAgICAgICAgICAgICByZWxwYXRoID0gJzxub25lPicKICAgICAgICAgc2VsZi5fcHJpbnRfZGVm YXVsdCgnICAlczogJXMnICUgKGV4dGVuc2lvblsxOl0sIHJlbHBhdGgpKQogCi0gICAgZGVmIF9w cmludF91bmV4cGVjdGVkX3Rlc3RfcmVzdWx0KHNlbGYsIHJlc3VsdCk6Ci0gICAgICAgIGRlc2Mg PSBUZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OX0RFU0NSSVBUSU9OU1tyZXN1bHQudHlwZV1b MF0KLSAgICAgICAgc2VsZi5fcHJpbnRfcXVpZXQoIiAgJXMgLT4gdW5leHBlY3RlZCAlcyIgJSAo cmVzdWx0LnRlc3RfbmFtZSwgZGVzYykpCi0KICAgICBkZWYgX3ByaW50X3Byb2dyZXNzKHNlbGYs IHJlc3VsdF9zdW1tYXJ5LCByZXRyeWluZywgdGVzdF9saXN0KToKICAgICAgICAgIiIiUHJpbnQg cHJvZ3Jlc3MgdGhyb3VnaCB0aGUgdGVzdHMgYXMgZGV0ZXJtaW5lZCBieSAtLXByaW50LiIiIgog ICAgICAgICBpZiByZXN1bHRfc3VtbWFyeS5yZW1haW5pbmcgPT0gMDoKQEAgLTQxOCw3ICs0MTUs NyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgICAgICBkZXNjcmlwdGlvbnMgPSBU ZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OX0RFU0NSSVBUSU9OUwogICAgICAgICAgICAgZm9y IGtleSwgdGVzdHMgaW4gZmxha3kuaXRlcml0ZW1zKCk6CiAgICAgICAgICAgICAgICAgcmVzdWx0 ID0gVGVzdEV4cGVjdGF0aW9ucy5FWFBFQ1RBVElPTlNba2V5Lmxvd2VyKCldCi0gICAgICAgICAg ICAgICAgc2VsZi5fcHJpbnRfZm9yX2JvdCgidW5leHBlY3RlZCBmbGFraW5lc3M6ICVzICglZCki ICUgKGRlc2NyaXB0aW9uc1tyZXN1bHRdWzFdLCBsZW4odGVzdHMpKSkKKyAgICAgICAgICAgICAg ICBzZWxmLl9wcmludF9mb3JfYm90KCJ1bmV4cGVjdGVkIGZsYWtpbmVzczogJXMgKCVkKSIgJSAo ZGVzY3JpcHRpb25zW3Jlc3VsdF1bMF0sIGxlbih0ZXN0cykpKQogICAgICAgICAgICAgICAgIHRl c3RzLnNvcnQoKQogCiAgICAgICAgICAgICAgICAgZm9yIHRlc3QgaW4gdGVzdHM6CkBAIC00MzUs NyArNDMyLDcgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICAgICAgZGVzY3JpcHRp b25zID0gVGVzdEV4cGVjdGF0aW9ucy5FWFBFQ1RBVElPTl9ERVNDUklQVElPTlMKICAgICAgICAg ICAgIGZvciBrZXksIHRlc3RzIGluIHJlZ3Jlc3Npb25zLml0ZXJpdGVtcygpOgogICAgICAgICAg ICAgICAgIHJlc3VsdCA9IFRlc3RFeHBlY3RhdGlvbnMuRVhQRUNUQVRJT05TW2tleS5sb3dlcigp XQotICAgICAgICAgICAgICAgIHNlbGYuX3ByaW50X2Zvcl9ib3QoIlJlZ3Jlc3Npb25zOiB1bmV4 cGVjdGVkICVzIDogKCVkKSIgJSAoZGVzY3JpcHRpb25zW3Jlc3VsdF1bMV0sIGxlbih0ZXN0cykp KQorICAgICAgICAgICAgICAgIHNlbGYuX3ByaW50X2Zvcl9ib3QoIlJlZ3Jlc3Npb25zOiB1bmV4 cGVjdGVkICVzIDogKCVkKSIgJSAoZGVzY3JpcHRpb25zW3Jlc3VsdF1bMF0sIGxlbih0ZXN0cykp KQogICAgICAgICAgICAgICAgIHRlc3RzLnNvcnQoKQogICAgICAgICAgICAgICAgIGZvciB0ZXN0 IGluIHRlc3RzOgogICAgICAgICAgICAgICAgICAgICBzZWxmLl9wcmludF9mb3JfYm90KCIgICVz ID0gJXMiICUgKHRlc3QsIGtleSkpCg== 157082 2012-08-07 18:48:29 -0700 2012-08-07 18:48:29 -0700 patch for landing bug-88702-20120807184804.patch text/plain 10524 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0OTY1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTlmMWEzMzIzYmY1NDRmNjAyZWRkMjdmYjg3NjQwOTUx NTMyMzI4Yi4uZDE2N2U5YWU5NjRlN2ZhNmFhZDgyYjAwYmU5YjMxNWE5ZDIwNzQzYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMy IEBACiAyMDEyLTA4LTA3ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIFtOUldUXSBXb3VsZCBsaWtlIGFuIG91dHB1dCBtb2RlIHNpbWlsYXIgdG8gT1JXVCB2 ZXJib3NlIG9uZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9ODg3MDIKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAg Q2hhbmdlIHRoZSAtLXZlcmJvc2UgbG9nZ2luZyBmb3IgbmV3LXJ1bi13ZWJraXQtdGVzdHMgc28g dGhhdAorICAgICAgICBpdCBtYXRjaGVzIE9SV1QgbW9yZTsgd2UganVzdCBwcmludCBvbmUgbGlu ZSBwZXIgdGVzdC4gVXNlCisgICAgICAgIC0tZGVidWctcnd0LWxvZ2dpbmcgdG8gZ2V0IHRoZSBm dWxsIGRlYnVnIHN0cmVhbSAoYWthIG9sZCBPUldUCisgICAgICAgIC0tdmVyYm9zZSkuCisKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3Rh dGlvbnMucHk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zKToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAoX3Nl dF91cF9kZXJpdmVkX29wdGlvbnMpOgorICAgICAgICAocGFyc2VfYXJncyk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlv bnRlc3QucHk6CisgICAgICAgIChNYWluVGVzdC50ZXN0X3JldHJ5aW5nX2FuZF9mbGFreV90ZXN0 cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRp bmcucHk6CisgICAgICAgIChwcmludF9vcHRpb25zKToKKyAgICAgICAgKFByaW50ZXIuX3ByaW50 X3Jlc3VsdF9zdW1tYXJ5X2VudHJ5KToKKyAgICAgICAgKFByaW50ZXIuX3ByaW50X29uZV9saW5l X3N1bW1hcnkpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfdGVzdF9yZXN1bHQpOgorICAgICAg ICAoUHJpbnRlci5fcHJpbnRfYmFzZWxpbmUpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfdW5l eHBlY3RlZF9yZXN1bHRzKToKKworMjAxMi0wOC0wNyAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNo cm9taXVtLm9yZz4KKwogICAgICAgICBucnd0OiBoYW5kbGUgZXJyb3JzIGZyb20gaW1hZ2UgZGlm ZiBiZXR0ZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTkyOTM0CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRleCA4ZWU4N2IzYzdkMDhk NTI5NTJlMDIwYTQ5M2ZjNzQxMzY3ZjVmMDhiLi45NjUxNTE4NjNiN2M5MWVmMDE3Nzk1NjUzZGQx Y2Y1OGM0YjkxZTI0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBAIC02OTAsMTgg KzY5MCwxNiBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zKG9iamVjdCk6CiAgICAgICAgICAgICAg ICAgICAgICdjcmFzaCc6IENSQVNILAogICAgICAgICAgICAgICAgICAgICAnbWlzc2luZyc6IE1J U1NJTkd9CiAKLSAgICBFWFBFQ1RBVElPTl9ERVNDUklQVElPTlMgPSB7U0tJUDogKCdza2lwcGVk JywgJ3NraXBwZWQnKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUEFTUzogKCdw YXNzJywgJ3Bhc3NlcycpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBURVhUOiAo J3RleHQgZGlmZiBtaXNtYXRjaCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAndGV4dCBkaWZmIG1pc21hdGNoJyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIElNQUdFOiAoJ2ltYWdlIG1pc21hdGNoJywgJ2ltYWdlIG1pc21hdGNoJyksCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIElNQUdFX1BMVVNfVEVYVDogKCdpbWFnZSBhbmQgdGV4 dCBtaXNtYXRjaCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICdpbWFnZSBhbmQgdGV4dCBtaXNtYXRjaCcpLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBBVURJTzogKCdhdWRpbyBtaXNtYXRjaCcsICdhdWRpbyBtaXNtYXRjaCcpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDUkFTSDogKCdjcmFzaCcsICdjcmFzaGVz JyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRJTUVPVVQ6ICgndGVzdCB0aW1l ZCBvdXQnLCAndGVzdHMgdGltZWQgb3V0JyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIE1JU1NJTkc6ICgnbm8gZXhwZWN0ZWQgcmVzdWx0IGZvdW5kJywKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICdubyBleHBlY3RlZCByZXN1bHRzIGZvdW5kJyl9 CisgICAgIyAoYWdncmVnYXRlZCBieSBjYXRlZ29yeSwgcGFzcy9mYWlsL3NraXAsIHR5cGUpCisg ICAgRVhQRUNUQVRJT05fREVTQ1JJUFRJT05TID0ge1NLSVA6ICgnc2tpcHBlZCcsICdza2lwcGVk JywgJycpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQVNTOiAoJ3Bhc3Nlcycs ICdwYXNzZWQnLCAnJyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRFWFQ6ICgn dGV4dCBmYWlsdXJlcycsICdmYWlsZWQnLCAnICh0ZXh0IGRpZmYpJyksCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIElNQUdFOiAoJ2ltYWdlLW9ubHkgZmFpbHVyZXMnLCAnZmFpbGVk JywgJyAoaW1hZ2UgZGlmZiknKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgSU1B R0VfUExVU19URVhUOiAoJ2JvdGggaW1hZ2UgYW5kIHRleHQgZmFpbHVyZXMnLCAnZmFpbGVkJywg JyAoYm90aCBpbWFnZSBhbmQgdGV4dCBkaWZmcycpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBBVURJTzogKCdhdWRpbyBmYWlsdXJlcycsICdmYWlsZWQnLCAnIChhdWRpbyBkaWZm KScpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDUkFTSDogKCdjcmFzaGVzJywg J2NyYXNoZWQnLCAnJyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRJTUVPVVQ6 ICgndGltZW91dHMnLCAndGltZWQgb3V0JywgJycpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBNSVNTSU5HOiAoJ21pc3NpbmcgcmVzdWx0cycsICdpcyBtaXNzaW5nIGFuIGV4cGVj dGVkIHJlc3VsdCcsICcnKX0KIAogICAgIEVYUEVDVEFUSU9OX09SREVSID0gKFBBU1MsIENSQVNI LCBUSU1FT1VULCBNSVNTSU5HLCBJTUFHRV9QTFVTX1RFWFQsIFRFWFQsIElNQUdFLCBBVURJTywg U0tJUCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggYTI2YTM0NTYwZTc5M2NiMWNlOTg1MDk3Y2IwODg4 YWE3ODNmOThkNS4uMDZiMzAzMmZmYjVhMzNmMWQyZDAwYTZkNzRhOWYwYzI4MjhjMTBkMSAxMDA3 NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90 ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5CkBAIC0xNzcsNiArMTc3LDkgQEAgZGVmIF9zZXRfdXBfZGVyaXZlZF9vcHRp b25zKHBvcnQsIG9wdGlvbnMpOgogCiAgICAgICAgIG9wdGlvbnMucGl4ZWxfdGVzdF9kaXJlY3Rv cmllcyA9IGxpc3QodmFyaWZpZWRfZGlycykKIAorICAgIGlmIG9wdGlvbnMucnVuX3NpbmdseToK KyAgICAgICAgb3B0aW9ucy52ZXJib3NlID0gVHJ1ZQorCiAgICAgcmV0dXJuIHdhcm5pbmdzCiAK IApAQCAtMzg5LDkgKzM5Miw4IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9uZSk6CiAgICAgICAg IG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWJhdGNoLXNpemUiLAogICAgICAgICAgICAgaGVscD0o IlJ1biBhIHRoZSB0ZXN0cyBpbiBiYXRjaGVzIChuKSwgYWZ0ZXIgZXZlcnkgbiB0ZXN0cywgIgog ICAgICAgICAgICAgICAgICAgIkR1bXBSZW5kZXJUcmVlIGlzIHJlbGF1bmNoZWQuIiksIHR5cGU9 ImludCIsIGRlZmF1bHQ9Tm9uZSksCi0gICAgICAgICMgb2xkLXJ1bi13ZWJraXQtdGVzdHMgaGFz IC0tcnVuLXNpbmdseSBpbXBseSAtLXZlcmJvc2UuCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCItLXJ1bi1zaW5nbHkiLCBhY3Rpb249InN0b3JlX3RydWUiLAotICAgICAgICAgICAgZGVm YXVsdD1GYWxzZSwgaGVscD0icnVuIGEgc2VwYXJhdGUgRHVtcFJlbmRlclRyZWUgZm9yIGVhY2gg dGVzdCIpLAorICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwgaGVscD0icnVuIGEgc2VwYXJhdGUg RHVtcFJlbmRlclRyZWUgZm9yIGVhY2ggdGVzdCAoaW1wbGllcyAtLXZlcmJvc2UpIiksCiAgICAg ICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWNoaWxkLXByb2Nlc3NlcyIsCiAgICAgICAgICAg ICBoZWxwPSJOdW1iZXIgb2YgRHVtcFJlbmRlclRyZWVzIHRvIHJ1biBpbiBwYXJhbGxlbC4iKSwK ICAgICAgICAgIyBGSVhNRTogRGlzcGxheSBkZWZhdWx0IG51bWJlciBvZiBjaGlsZCBwcm9jZXNz ZXMgdGhhdCB3aWxsIHJ1bi4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRl c3QucHkKaW5kZXggN2VkOGZmZDFlYzgyNDVmYmEwMjBkMzY4NWJhMDIwNDcxNGJjOGE3ZC4uZWNi NThiODlkYTgwZjNlMTMyN2ExNTQzODM5MDgxMjg5ZmNiY2VjOSAxMDA3NTUKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlv bnRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dl YmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKQEAgLTc2NCw3ICs3NjQsNyBAQCBjbGFzcyBN YWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01peGluKToKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbHMocmVzLCAxKQogICAgICAgICBzZWxmLmFzc2VydFRydWUoJ0Nsb2Ji ZXJpbmcgb2xkIHJlc3VsdHMnIGluIGVyci5nZXR2YWx1ZSgpKQogICAgICAgICBzZWxmLmFzc2Vy dFRydWUoJ2ZsYWt5L3RleHQuaHRtbCcgaW4gZXJyLmdldHZhbHVlKCkpCi0gICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZSgnVW5leHBlY3RlZCB0ZXh0IGRpZmYnIGluIG91dC5nZXR2YWx1ZSgpKQorICAg ICAgICBzZWxmLmFzc2VydFRydWUoJ1VuZXhwZWN0ZWQgdGV4dCBmYWlsdXJlcycgaW4gb3V0Lmdl dHZhbHVlKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoJ1VuZXhwZWN0ZWQgZmxha2luZXNz JyBpbiBvdXQuZ2V0dmFsdWUoKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGhvc3QuZmlsZXN5 c3RlbS5leGlzdHMoJy90bXAvbGF5b3V0LXRlc3QtcmVzdWx0cy9mYWlsdXJlcy9mbGFreS90ZXh0 LWFjdHVhbC50eHQnKSkKICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShob3N0LmZpbGVzeXN0ZW0u ZXhpc3RzKCdyZXRyaWVzJykpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CmluZGV4IDc3ZTQ3MTI1Yzk0N2Q1ZmFmMDY2ZWI5 OTk2NzdiMjk4NDJjYjAwNGEuLjJlZjJlM2ZhNzlkNTdmNDIyOGNmOWNjNjgxYWZhZWM2ZWNkM2Rm NzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdz L3ByaW50aW5nLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Zp ZXdzL3ByaW50aW5nLnB5CkBAIC00Niw4ICs0Niw4IEBAIGRlZiBwcmludF9vcHRpb25zKCk6CiAg ICAgcmV0dXJuIFsKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy1xJywgJy0tcXVpZXQn LCBhY3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBoZWxwPSdydW4gcXVpZXRseSAoZXJyb3JzLCB3YXJuaW5ncywgYW5kIHByb2dy ZXNzIG9ubHkpJyksCi0gICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCctdicsICctLXZlcmJv c2UnLCBhY3Rpb249J3N0b3JlX3RydWUnLCBkZWZhdWx0PUZhbHNlLCBkZXN0PSdkZWJ1Z19yd3Rf bG9nZ2luZycsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J3NhbWUgYXMgLS1k ZWJ1Zy1yd3QtbG9nZ2luZyAoZm9yIG5vdyknKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRp b24oJy12JywgJy0tdmVyYm9zZScsIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlZmF1bHQ9RmFsc2Us CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J3ByaW50IGEgc3VtbWFyaXplZCBy ZXN1bHQgZm9yIGV2ZXJ5IHRlc3QgKG9uZSBsaW5lIHBlciB0ZXN0KScpLAogICAgICAgICBvcHRw YXJzZS5tYWtlX29wdGlvbignLS1kZXRhaWxzJywgYWN0aW9uPSdzdG9yZV90cnVlJywgZGVmYXVs dD1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0ncHJpbnQgZGV0YWls ZWQgcmVzdWx0cyBmb3IgZXZlcnkgdGVzdCcpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlv bignLS1kZWJ1Zy1yd3QtbG9nZ2luZycsIGFjdGlvbj0nc3RvcmVfdHJ1ZScsIGRlZmF1bHQ9RmFs c2UsCkBAIC0yOTMsNyArMjkzLDcgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICAg ICAgZGVzYyA9IFRlc3RFeHBlY3RhdGlvbnMuRVhQRUNUQVRJT05fREVTQ1JJUFRJT05TW3Jlc3Vs dF0KICAgICAgICAgICAgIGlmIG5vdF9wYXNzaW5nIGFuZCBsZW4ocmVzdWx0cyk6CiAgICAgICAg ICAgICAgICAgcGN0ID0gbGVuKHJlc3VsdHMpICogMTAwLjAgLyBub3RfcGFzc2luZwotICAgICAg ICAgICAgICAgIHNlbGYuX3ByaW50X2Zvcl9ib3QoIiAgJTVkICUtMjRzICglNC4xZiUlKSIgJSAo bGVuKHJlc3VsdHMpLCBkZXNjW2xlbihyZXN1bHRzKSAhPSAxXSwgcGN0KSkKKyAgICAgICAgICAg ICAgICBzZWxmLl9wcmludF9mb3JfYm90KCIgICU1ZCAlLTI0cyAoJTQuMWYlJSkiICUgKGxlbihy ZXN1bHRzKSwgZGVzY1swXSwgcGN0KSkKIAogICAgIGRlZiBfcHJpbnRfb25lX2xpbmVfc3VtbWFy eShzZWxmLCB0b3RhbCwgZXhwZWN0ZWQsIHVuZXhwZWN0ZWQpOgogICAgICAgICBpbmNvbXBsZXRl ID0gdG90YWwgLSBleHBlY3RlZCAtIHVuZXhwZWN0ZWQKQEAgLTMwMiw3ICszMDIsNyBAQCBjbGFz cyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCIiKQog ICAgICAgICAgICAgaW5jb21wbGV0ZV9zdHIgPSAiICglZCBkaWRuJ3QgcnVuKSIgJSBpbmNvbXBs ZXRlCiAKLSAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5kZWJ1Z19yd3RfbG9nZ2luZyBvciB1bmV4 cGVjdGVkOgorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnZlcmJvc2Ugb3Igc2VsZi5fb3B0aW9u cy5kZWJ1Z19yd3RfbG9nZ2luZyBvciB1bmV4cGVjdGVkOgogICAgICAgICAgICAgc2VsZi53cml0 ZWxuKCIiKQogCiAgICAgICAgIHN1bW1hcnkgPSAnJwpAQCAtMzI3LDggKzMyNyw5IEBAIGNsYXNz IFByaW50ZXIob2JqZWN0KToKICAgICBkZWYgX3ByaW50X3Rlc3RfcmVzdWx0KHNlbGYsIHJlc3Vs dCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdvdF9zdHIpOgogICAgICAgICBpZiBzZWxmLl9vcHRpb25z LmRldGFpbHM6CiAgICAgICAgICAgICBzZWxmLl9wcmludF90ZXN0X3RyYWNlKHJlc3VsdCwgZXhw X3N0ciwgZ290X3N0cikKLSAgICAgICAgZWxpZiBub3QgZXhwZWN0ZWQ6Ci0gICAgICAgICAgICBz ZWxmLl9wcmludF91bmV4cGVjdGVkX3Rlc3RfcmVzdWx0KHJlc3VsdCkKKyAgICAgICAgZWxpZiAo c2VsZi5fb3B0aW9ucy52ZXJib3NlIGFuZCBub3Qgc2VsZi5fb3B0aW9ucy5kZWJ1Z19yd3RfbG9n Z2luZykgb3Igbm90IGV4cGVjdGVkOgorICAgICAgICAgICAgZGVzYyA9IFRlc3RFeHBlY3RhdGlv bnMuRVhQRUNUQVRJT05fREVTQ1JJUFRJT05TW3Jlc3VsdC50eXBlXQorICAgICAgICAgICAgc2Vs Zi53cml0ZWxuKCIlcyAlcyVzJXMiICUgKHJlc3VsdC50ZXN0X25hbWUsIGRlc2NbMV0sICIiIGlm IGV4cGVjdGVkIGVsc2UgIiB1bmV4cGVjdGVkbHkiLCBkZXNjWzJdKSkKIAogICAgIGRlZiBfcHJp bnRfdGVzdF90cmFjZShzZWxmLCByZXN1bHQsIGV4cF9zdHIsIGdvdF9zdHIpOgogICAgICAgICB0 ZXN0X25hbWUgPSByZXN1bHQudGVzdF9uYW1lCkBAIC0zNTYsMTAgKzM1Nyw2IEBAIGNsYXNzIFBy aW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIHJlbHBhdGggPSAnPG5vbmU+JwogICAgICAgICBz ZWxmLl9wcmludF9kZWZhdWx0KCcgICVzOiAlcycgJSAoZXh0ZW5zaW9uWzE6XSwgcmVscGF0aCkp CiAKLSAgICBkZWYgX3ByaW50X3VuZXhwZWN0ZWRfdGVzdF9yZXN1bHQoc2VsZiwgcmVzdWx0KToK LSAgICAgICAgZGVzYyA9IFRlc3RFeHBlY3RhdGlvbnMuRVhQRUNUQVRJT05fREVTQ1JJUFRJT05T W3Jlc3VsdC50eXBlXVswXQotICAgICAgICBzZWxmLl9wcmludF9xdWlldCgiICAlcyAtPiB1bmV4 cGVjdGVkICVzIiAlIChyZXN1bHQudGVzdF9uYW1lLCBkZXNjKSkKLQogICAgIGRlZiBfcHJpbnRf cHJvZ3Jlc3Moc2VsZiwgcmVzdWx0X3N1bW1hcnksIHJldHJ5aW5nLCB0ZXN0X2xpc3QpOgogICAg ICAgICAiIiJQcmludCBwcm9ncmVzcyB0aHJvdWdoIHRoZSB0ZXN0cyBhcyBkZXRlcm1pbmVkIGJ5 IC0tcHJpbnQuIiIiCiAgICAgICAgIGlmIHJlc3VsdF9zdW1tYXJ5LnJlbWFpbmluZyA9PSAwOgpA QCAtNDE4LDcgKzQxNSw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIGRl c2NyaXB0aW9ucyA9IFRlc3RFeHBlY3RhdGlvbnMuRVhQRUNUQVRJT05fREVTQ1JJUFRJT05TCiAg ICAgICAgICAgICBmb3Iga2V5LCB0ZXN0cyBpbiBmbGFreS5pdGVyaXRlbXMoKToKICAgICAgICAg ICAgICAgICByZXN1bHQgPSBUZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OU1trZXkubG93ZXIo KV0KLSAgICAgICAgICAgICAgICBzZWxmLl9wcmludF9mb3JfYm90KCJVbmV4cGVjdGVkIGZsYWtp bmVzczogJXMgKCVkKSIgJSAoZGVzY3JpcHRpb25zW3Jlc3VsdF1bMV0sIGxlbih0ZXN0cykpKQor ICAgICAgICAgICAgICAgIHNlbGYuX3ByaW50X2Zvcl9ib3QoIlVuZXhwZWN0ZWQgZmxha2luZXNz OiAlcyAoJWQpIiAlIChkZXNjcmlwdGlvbnNbcmVzdWx0XVswXSwgbGVuKHRlc3RzKSkpCiAgICAg ICAgICAgICAgICAgdGVzdHMuc29ydCgpCiAKICAgICAgICAgICAgICAgICBmb3IgdGVzdCBpbiB0 ZXN0czoKQEAgLTQzNSw3ICs0MzIsNyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAg ICAgICBkZXNjcmlwdGlvbnMgPSBUZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OX0RFU0NSSVBU SU9OUwogICAgICAgICAgICAgZm9yIGtleSwgdGVzdHMgaW4gcmVncmVzc2lvbnMuaXRlcml0ZW1z KCk6CiAgICAgICAgICAgICAgICAgcmVzdWx0ID0gVGVzdEV4cGVjdGF0aW9ucy5FWFBFQ1RBVElP TlNba2V5Lmxvd2VyKCldCi0gICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRfZm9yX2JvdCgiUmVn cmVzc2lvbnM6IFVuZXhwZWN0ZWQgJXMgOiAoJWQpIiAlIChkZXNjcmlwdGlvbnNbcmVzdWx0XVsx XSwgbGVuKHRlc3RzKSkpCisgICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRfZm9yX2JvdCgiUmVn cmVzc2lvbnM6IFVuZXhwZWN0ZWQgJXMgOiAoJWQpIiAlIChkZXNjcmlwdGlvbnNbcmVzdWx0XVsw XSwgbGVuKHRlc3RzKSkpCiAgICAgICAgICAgICAgICAgdGVzdHMuc29ydCgpCiAgICAgICAgICAg ICAgICAgZm9yIHRlc3QgaW4gdGVzdHM6CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3ByaW50 X2Zvcl9ib3QoIiAgJXMgPSAlcyIgJSAodGVzdCwga2V5KSkK