93563 2012-08-08 17:52:31 -0700 nrwt: should log progress like ninja does 2012-08-09 14:36:04 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth ap eric ojan rniwa tony webkit.review.bot oldest_to_newest 691024 0 dpranke 2012-08-08 17:52:31 -0700 nrwt: should log progress like ninja does 691029 1 157354 dpranke 2012-08-08 18:02:13 -0700 Created attachment 157354 Patch 691827 2 157354 ojan 2012-08-09 14:10:45 -0700 Comment on attachment 157354 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=157354&action=review Can you post a few lines of the --verbose output? > Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:48 > + nuM_tests = 0 typo > Tools/Scripts/webkitpy/layout_tests/views/printing.py:348 > + suffix += ' unexpectedly' + desc[2] I know it's technically correct to say "unexpectedly" here...but I'm not sure it really adds valuable information in practice. I don't feel strongly, but I'd probably leave it out and see if people are confused. 691837 3 dpranke 2012-08-09 14:19:01 -0700 (In reply to comment #2) > (From update of attachment 157354 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=157354&action=review > > Can you post a few lines of the --verbose output? Sure: Scripts $ ./run-webkit-tests --chromium --verbose fast/html Using port 'chromium-mac-lion' Test configuration: <lion, x86, release> Placing test results in None Baseline search path: chromium-mac -> chromium -> mac -> generic Using Release build Pixel tests enabled Regular timeout: 6000, slow test timeout: 30000 Command line: /src/wk/out/Release/DumpRenderTree.app/Contents/MacOS/DumpRenderTree - Found 114 tests; running 114, skipping 0. Running 1 DumpRenderTree over 1 shard. [1/114] fast/html/adjacent-html-context-element.html passed [2/114] fast/html/adopt-parent-frame.html passed # ... [113/114] fast/html/unknown-tag.html passed [114/114] fast/html/xhtml-serialize.html passed All 114 tests ran as expected. % > > > Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:48 > > + nuM_tests = 0 > > typo > will fix. > > Tools/Scripts/webkitpy/layout_tests/views/printing.py:348 > > + suffix += ' unexpectedly' + desc[2] > > I know it's technically correct to say "unexpectedly" here...but I'm not sure it really adds valuable information in practice. I don't feel strongly, but I'd probably leave it out and see if people are confused. If you don't print something to indicate expected/unexpected, then in --verbose mode you can't tell them apart, and that seems bad. Also, note that the only real difference between the default logging and --verbose is that expected results get erased by default (so we're still printing "foo.html passed" or "foo.html failed (text diff)" for expected failures by default, that just gets erased by the next test. Given your feedback, I tried the thought experiment of printing "as expected" for expected passes or failures, but that felt worse. 691847 4 157547 dpranke 2012-08-09 14:24:54 -0700 Created attachment 157547 fix typo in layout_test_runner_unittest.py 691853 5 157547 ojan 2012-08-09 14:27:47 -0700 Comment on attachment 157547 fix typo in layout_test_runner_unittest.py Looks great. I think this + the config printing is a big improvement! 691863 6 dpranke 2012-08-09 14:36:04 -0700 Committed r125204: <http://trac.webkit.org/changeset/125204> 157354 2012-08-08 18:02:13 -0700 2012-08-09 14:24:51 -0700 Patch bug-93563-20120808180147.patch text/plain 10894 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MTE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTAwZDg4OWE5M2ViZGQ1ZDlhYzg4NThkMjk2ZjMwM2Rh OTBkNzI5ZC4uNmY1ZGQxZjA1NzVlZmM0OTNlZjlhNThmOGE2YWI4ZWM1MzcxOWE4OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU5 IEBACiAyMDEyLTA4LTA4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IHNob3VsZCBsb2cgcHJvZ3Jlc3MgbGlrZSBuaW5qYSBkb2VzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzU2MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIG1vZGlm aWVzIHRoZSBvdXRwdXQgb2YgbnJ3dCBpbiB0aGUKKyAgICAgICAgbm9uLS1kZWJ1Zy1yd3QtbG9n Z2luZyBtb2Rlcy4KKworICAgICAgICBJbiBub24tdmVyYm9zZSBtb2RlLCB0aGUgb3V0cHV0IGNo YW5nZXMgZnJvbToKKyAgICAgICAgICAiVGVzdGluZyAoNTAlKTogOTYgcmFuIGFzIGV4cGVjdGVk LCA0IGRpZG4ndCwgMTAwIGxlZnQiCisgICAgICAgIHRvOgorICAgICAgICAgICJbMTAwLzIwMF0g Zm9vLmh0bWwgKCs0KSIKKyAgICAgICAgb3I6CisgICAgICAgICAgIlsxMDAvMjAwXSBmb28uaHRt bCBmYWlsZWQgIHVuZXhwZWN0ZWRseSAodGV4dCBkaWZmKSIKKworICAgICAgICB3aGljaCBpbmRp Y2F0ZXMgdGhlIGVhcmxpZXN0IHRlc3QgY3VycmVudGx5IHJ1bm5pbmcgKG9wdGlvbmFsbHkgcGx1 cyB0aGUKKyAgICAgICAgY291bnQgb2Ygb3RoZXIgY3VycmVudGx5LWV4ZWN1dGluZyB0ZXN0cyBp ZiB3ZSdyZSBydW5uaW5nIHRlc3RzIGluIHBhcmFsbGVsKQorICAgICAgICBvciB0aGUgcmVzdWx0 IG9mIHNhaWQgdGVzdC4KKworICAgICAgICBJZiB0aGUgdGVzdCBwcm9kdWNlcyB1bmV4cGVjdGVk IHJlc3VsdHMsIHRoYXQgbGluZSBpcyBmbHVzaGVkCisgICAgICAgIHJhdGhlciB0aGFuIGVyYXNl ZCAoc28gd2Ugbm8gbG9uZ2VyIG5lZWQgdGhlICVkIGRpZG4ndCBydW5uaW5nCisgICAgICAgIHRh bGx5KS4KKworICAgICAgICBJbiAtLXZlcmJvc2UgbW9kZSwgdGhlIG91dHB1dCBpcyBzaW1pbGFy LCBidXQgZXZlcnkgdGVzdCBnZXRzIGEKKyAgICAgICAgbGluZSAoYW5kIHRlc3RzIGFyZSBsb2dn ZWQgaW4gb3JkZXIgb2YgdGhlbSBiZWluZyBzdGFydGVkLCBub3QKKyAgICAgICAgb3JkZXIgb2Yg dGhlbSBiZWluZyBjb21wbGV0ZWQpIChhbmQgaW4gLS1kZXRhaWxzIG1vZGUsIHRoZQorICAgICAg ICBmaXJzdCBsaW5lIG9mIGVhY2ggdGVzdCBtYXRjaGVzIC0tdmVyYm9zZSBidXQgdGhlIG90aGVy IGxpbmVzCisgICAgICAgIGFyZSB1bmNoYW5nZWQpLgorICAgICAgICAKKyAgICAgICAgVGhlIG92 ZXJhbGwgcmVzdWx0IHNob3VsZCBiZSBlYXNpZXIgdG8gcmVhZCBhbmQgaXMgc2ltcGxlciB0bwor ICAgICAgICBpbXBsZW1lbnQgYXMgd2VsbCAoYXBhcnQgZnJvbSBtYW5hZ2luZyB0aGUgbnVtYmVy IG9mIHRlc3RzIHRoYXQKKyAgICAgICAgaGF2ZSBzdGFydGVkIGJ1dCBub3QgY29tcGxldGVkLCB3 aGljaCBpcyBzbGlnaHRseSBhbm5veWluZykuCisKKyAgICAgICAgVGhpcyBhbHNvIG1hdGNoZXMg dGhlIG91dHB1dCBzdHlsZSBmb3IgdGVzdC13ZWJraXRweSwgbW9yZS1vci1sZXNzLgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rl c3RfcnVubmVyLnB5OgorICAgICAgICAoTGF5b3V0VGVzdFJ1bm5lci5ydW5fdGVzdHMpOgorICAg ICAgICAoTGF5b3V0VGVzdFJ1bm5lci5fdXBkYXRlX3N1bW1hcnlfd2l0aF9yZXN1bHQpOgorICAg ICAgICAoTGF5b3V0VGVzdFJ1bm5lci5faGFuZGxlX3N0YXJ0ZWRfdGVzdCk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVu bmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRmFrZVByaW50ZXIpOgorICAgICAgICAoRmFrZVBy aW50ZXIucHJpbnRfc3RhcnRlZF90ZXN0KToKKyAgICAgICAgKEZha2VQcmludGVyLnByaW50X2Zp bmlzaGVkX3Rlc3QpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Zp ZXdzL3ByaW50aW5nLnB5OgorICAgICAgICAoUHJpbnRlci5fX2luaXRfXyk6CisgICAgICAgIChQ cmludGVyLnByaW50X3N0YXJ0ZWRfdGVzdCk6CisgICAgICAgIChQcmludGVyLnByaW50X2Zpbmlz aGVkX3Rlc3QpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfdGVzdF90cmFjZSk6CisgICAgICAg IChQcmludGVyLl9wcmludF9wcm9ncmVzcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X2Rl dGFpbHMpOgorCisyMDEyLTA4LTA4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3Jn PgorCiAgICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lLWV4cGVjdGF0aW9ucyBuZWVkcyB0 byBzdXBwb3J0IG11bHRpcGxlIGV4cGVjdGF0aW9ucyBmaWxlcwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkwNTEKIApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVu bmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bGF5b3V0X3Rlc3RfcnVubmVyLnB5CmluZGV4IGQyMTRjMjFiYzNiMzQ1YzIwOGMzNzQ4MTQwNTY5 NjM3ZTkzOTZhZDUuLmFlMzQyMjU2MWUxZDA3OTFjY2YwOGQ2NTM2MGNiNzhmMjAxM2M2ZjkgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L2xheW91dF90ZXN0X3J1bm5lci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkKQEAgLTEwMSw2ICsxMDEs OCBAQCBjbGFzcyBMYXlvdXRUZXN0UnVubmVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX25lZWRz X3dlYnNvY2tldHMgPSBuZWVkc193ZWJzb2NrZXRzCiAgICAgICAgIHNlbGYuX3JldHJ5aW5nID0g cmV0cnlpbmcKICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0gW3Rlc3RfaW5wdXQudGVz dF9uYW1lIGZvciB0ZXN0X2lucHV0IGluIHRlc3RfaW5wdXRzXQorICAgICAgICBzZWxmLl9wcmlu dGVyLm51bV90ZXN0cyA9IGxlbihzZWxmLl90ZXN0X2ZpbGVzX2xpc3QpCisgICAgICAgIHNlbGYu X3ByaW50ZXIubnVtX2NvbXBsZXRlZCA9IDAKIAogICAgICAgICBzZWxmLl9hbGxfcmVzdWx0cyA9 IFtdCiAgICAgICAgIHNlbGYuX2dyb3VwX3N0YXRzID0ge30KQEAgLTIwMiw4ICsyMDQsNyBAQCBj bGFzcyBMYXlvdXRUZXN0UnVubmVyKG9iamVjdCk6CiAKICAgICAgICAgcmVzdWx0X3N1bW1hcnku YWRkKHJlc3VsdCwgZXhwZWN0ZWQsIHNlbGYuX3Rlc3RfaXNfc2xvdyhyZXN1bHQudGVzdF9uYW1l KSkKIAotICAgICAgICAjIEZJWE1FOiB0aGVyZSdzIHRvbyBtYW55IGFyZ3VtZW50cyB0byB0aGlz IGZ1bmN0aW9uLgotICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2ZpbmlzaGVkX3Rlc3QocmVz dWx0LCBleHBlY3RlZCwgZXhwX3N0ciwgZ290X3N0ciwgcmVzdWx0X3N1bW1hcnksIHNlbGYuX3Jl dHJ5aW5nLCBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QpCisgICAgICAgIHNlbGYuX3ByaW50ZXIucHJp bnRfZmluaXNoZWRfdGVzdChyZXN1bHQsIGV4cGVjdGVkLCBleHBfc3RyLCBnb3Rfc3RyKQogCiAg ICAgICAgIHNlbGYuX2ludGVycnVwdF9pZl9hdF9mYWlsdXJlX2xpbWl0cyhyZXN1bHRfc3VtbWFy eSkKIApAQCAtMjM3LDggKzIzOCw3IEBAIGNsYXNzIExheW91dFRlc3RSdW5uZXIob2JqZWN0KToK ICAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoJ3Vua25vd24gbWVzc2FnZSAlcyByZWNlaXZl ZCBmcm9tICVzLCBhcmdzPSVzJyAlIChuYW1lLCBzb3VyY2UsIHJlcHIoYXJncykpKQogCiAgICAg ZGVmIF9oYW5kbGVfc3RhcnRlZF90ZXN0KHNlbGYsIHdvcmtlcl9uYW1lLCB0ZXN0X2lucHV0LCB0 ZXN0X3RpbWVvdXRfc2VjKToKLSAgICAgICAgIyBGSVhNRTogbG9nIHRoYXQgd2UndmUgc3RhcnRl ZCBhbm90aGVyIHRlc3QuCi0gICAgICAgIHBhc3MKKyAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF9zdGFydGVkX3Rlc3QodGVzdF9pbnB1dC50ZXN0X25hbWUpCiAKICAgICBkZWYgX2hhbmRsZV9m aW5pc2hlZF90ZXN0X2xpc3Qoc2VsZiwgd29ya2VyX25hbWUsIGxpc3RfbmFtZSwgbnVtX3Rlc3Rz LCBlbGFwc2VkX3RpbWUpOgogICAgICAgICBzZWxmLl9ncm91cF9zdGF0c1tsaXN0X25hbWVdID0g KG51bV90ZXN0cywgZWxhcHNlZF90aW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5 b3V0X3Rlc3RfcnVubmVyX3VuaXR0ZXN0LnB5CmluZGV4IDIwODMyMjFjZTg3YjI1MjcyYjFhMWNh Y2Y5MWQ3OWM0YjAyNmQwODAuLjhlYjIzNzFkYzI4ZmQ3ZmYzMDRiM2I2NzY0Y2VhMmJmZmU3ZDk1 ZGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL2xheW91dF90ZXN0X3J1bm5lcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5p dHRlc3QucHkKQEAgLTQ0LDEwICs0NCwxNiBAQCBUZXN0RXhwZWN0YXRpb25zID0gdGVzdF9leHBl Y3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucwogCiAKIGNsYXNzIEZha2VQcmludGVyKG9iamVjdCk6 CisgICAgbnVtX2NvbXBsZXRlZCA9IDAKKyAgICBudU1fdGVzdHMgPSAwCisKICAgICBkZWYgcHJp bnRfd29ya2Vyc19hbmRfc2hhcmRzKHNlbGYsIG51bV93b3JrZXJzLCBudW1fc2hhcmRzLCBudW1f bG9ja2VkX3NoYXJkcyk6CiAgICAgICAgIHBhc3MKIAotICAgIGRlZiBwcmludF9maW5pc2hlZF90 ZXN0KHNlbGYsIHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdvdF9zdHIsIHJlc3VsdF9zdW1t YXJ5LCByZXRyeWluZywgdGVzdF9uYW1lcyk6CisgICAgZGVmIHByaW50X3N0YXJ0ZWRfdGVzdChz ZWxmLCB0ZXN0X25hbWUpOgorICAgICAgICBwYXNzCisKKyAgICBkZWYgcHJpbnRfZmluaXNoZWRf dGVzdChzZWxmLCByZXN1bHQsIGV4cGVjdGVkLCBleHBfc3RyLCBnb3Rfc3RyKToKICAgICAgICAg cGFzcwogCiAgICAgZGVmIHdyaXRlKHNlbGYsIG1zZyk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CmluZGV4IDJlZjJlM2Zh NzlkNTdmNDIyOGNmOWNjNjgxYWZhZWM2ZWNkM2RmNzMuLmMyM2ZkN2Q0MGNmNmIyOGMxMWFmYTRk M2NiMDc2OGU5NWI3ZTVlYmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CkBAIC02OCwxMCArNjgsMTQgQEAgY2xhc3Mg UHJpbnRlcihvYmplY3QpOgogICAgIEJ5IGRlZmF1bHQgdGhlIGJ1aWxkYm90LXBhcnNlZCBjb2Rl IGdldHMgbG9nZ2VkIHRvIHN0ZG91dCwgYW5kIHJlZ3VsYXIKICAgICBvdXRwdXQgZ2V0cyBsb2dn ZWQgdG8gc3RkZXJyLiIiIgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBvcHRpb25zLCBy ZWd1bGFyX291dHB1dCwgYnVpbGRib3Rfb3V0cHV0LCBsb2dnZXI9Tm9uZSk6CisgICAgICAgIHNl bGYubnVtX2NvbXBsZXRlZCA9IDAKKyAgICAgICAgc2VsZi5udW1fdGVzdHMgPSAwCiAgICAgICAg IHNlbGYuX3BvcnQgPSBwb3J0CiAgICAgICAgIHNlbGYuX29wdGlvbnMgPSBvcHRpb25zCiAgICAg ICAgIHNlbGYuX2J1aWxkYm90X3N0cmVhbSA9IGJ1aWxkYm90X291dHB1dAogICAgICAgICBzZWxm Ll9tZXRlciA9IE1ldGVyZWRTdHJlYW0ocmVndWxhcl9vdXRwdXQsIG9wdGlvbnMuZGVidWdfcnd0 X2xvZ2dpbmcsIGxvZ2dlcj1sb2dnZXIpCisgICAgICAgIHNlbGYuX3J1bm5pbmdfdGVzdHMgPSBb XQorICAgICAgICBzZWxmLl9jb21wbGV0ZWRfdGVzdHMgPSBbXQogCiAgICAgZGVmIGNsZWFudXAo c2VsZik6CiAgICAgICAgIHNlbGYuX21ldGVyLmNsZWFudXAoKQpAQCAtMzIwLDIwICszMjQsNDcg QEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICBzZWxmLl9wcmludF9xdWlldChzdW1t YXJ5KQogICAgICAgICBzZWxmLl9wcmludF9xdWlldCgiIikKIAotICAgIGRlZiBwcmludF9maW5p c2hlZF90ZXN0KHNlbGYsIHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdvdF9zdHIsIHJlc3Vs dF9zdW1tYXJ5LCByZXRyeWluZywgdGVzdF9maWxlc19saXN0KToKLSAgICAgICAgc2VsZi5fcHJp bnRfdGVzdF9yZXN1bHQocmVzdWx0LCBleHBlY3RlZCwgZXhwX3N0ciwgZ290X3N0cikKLSAgICAg ICAgc2VsZi5fcHJpbnRfcHJvZ3Jlc3MocmVzdWx0X3N1bW1hcnksIHJldHJ5aW5nLCB0ZXN0X2Zp bGVzX2xpc3QpCisgICAgZGVmIHByaW50X3N0YXJ0ZWRfdGVzdChzZWxmLCB0ZXN0X25hbWUpOgor ICAgICAgICBzZWxmLl9ydW5uaW5nX3Rlc3RzLmFwcGVuZCh0ZXN0X25hbWUpCisgICAgICAgIGlm IGxlbihzZWxmLl9ydW5uaW5nX3Rlc3RzKSA+IDE6CisgICAgICAgICAgICBzdWZmaXggPSAnICgr JWQpJyAlIChsZW4oc2VsZi5fcnVubmluZ190ZXN0cykgLSAxKQorICAgICAgICBlbHNlOgorICAg ICAgICAgICAgc3VmZml4ID0gJycKKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy52ZXJib3NlOgor ICAgICAgICAgICAgd3JpdGUgPSBzZWxmLl9tZXRlci53cml0ZV91cGRhdGUKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIHdyaXRlID0gc2VsZi5fbWV0ZXIud3JpdGVfdGhyb3R0bGVkX3VwZGF0 ZQorICAgICAgICB3cml0ZSgnWyVkLyVkXSAlcyVzJyAlIChzZWxmLm51bV9jb21wbGV0ZWQsIHNl bGYubnVtX3Rlc3RzLCB0ZXN0X25hbWUsIHN1ZmZpeCkpCiAKLSAgICBkZWYgX3ByaW50X3Rlc3Rf cmVzdWx0KHNlbGYsIHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdvdF9zdHIpOgorICAgIGRl ZiBwcmludF9maW5pc2hlZF90ZXN0KHNlbGYsIHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdv dF9zdHIpOgorICAgICAgICBzZWxmLm51bV9jb21wbGV0ZWQgKz0gMQorICAgICAgICB0ZXN0X25h bWUgPSByZXN1bHQudGVzdF9uYW1lCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuZGV0YWlsczoK ICAgICAgICAgICAgIHNlbGYuX3ByaW50X3Rlc3RfdHJhY2UocmVzdWx0LCBleHBfc3RyLCBnb3Rf c3RyKQogICAgICAgICBlbGlmIChzZWxmLl9vcHRpb25zLnZlcmJvc2UgYW5kIG5vdCBzZWxmLl9v cHRpb25zLmRlYnVnX3J3dF9sb2dnaW5nKSBvciBub3QgZXhwZWN0ZWQ6CiAgICAgICAgICAgICBk ZXNjID0gVGVzdEV4cGVjdGF0aW9ucy5FWFBFQ1RBVElPTl9ERVNDUklQVElPTlNbcmVzdWx0LnR5 cGVdCi0gICAgICAgICAgICBzZWxmLndyaXRlbG4oIiVzICVzJXMlcyIgJSAocmVzdWx0LnRlc3Rf bmFtZSwgZGVzY1sxXSwgIiIgaWYgZXhwZWN0ZWQgZWxzZSAiIHVuZXhwZWN0ZWRseSIsIGRlc2Nb Ml0pKQorICAgICAgICAgICAgc3VmZml4ID0gJyAnICsgZGVzY1sxXQorICAgICAgICAgICAgaWYg bm90IGV4cGVjdGVkOgorICAgICAgICAgICAgICAgIHN1ZmZpeCArPSAnIHVuZXhwZWN0ZWRseScg KyBkZXNjWzJdCisgICAgICAgICAgICBzZWxmLndyaXRlbG4oIlslZC8lZF0gJXMlcyIgJSAoc2Vs Zi5udW1fY29tcGxldGVkLCBzZWxmLm51bV90ZXN0cywgdGVzdF9uYW1lLCBzdWZmaXgpKQorICAg ICAgICBlbGlmIHNlbGYubnVtX2NvbXBsZXRlZCA9PSBzZWxmLm51bV90ZXN0czoKKyAgICAgICAg ICAgIHNlbGYuX21ldGVyLndyaXRlX3VwZGF0ZSgnJykKKyAgICAgICAgZWxzZToKKyAgICAgICAg ICAgIGRlc2MgPSBUZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OX0RFU0NSSVBUSU9OU1tyZXN1 bHQudHlwZV0KKyAgICAgICAgICAgIHN1ZmZpeCA9ICcgJyArIGRlc2NbMV0KKyAgICAgICAgICAg IGlmIHRlc3RfbmFtZSA9PSBzZWxmLl9ydW5uaW5nX3Rlc3RzWzBdOgorICAgICAgICAgICAgICAg IHNlbGYuX2NvbXBsZXRlZF90ZXN0cy5pbnNlcnQoMCwgW3Rlc3RfbmFtZSwgc3VmZml4XSkKKyAg ICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgc2VsZi5fY29tcGxldGVkX3Rlc3RzLmFw cGVuZChbdGVzdF9uYW1lLCBzdWZmaXhdKQorCisgICAgICAgICAgICBmb3IgdGVzdF9uYW1lLCBz dWZmaXggaW4gc2VsZi5fY29tcGxldGVkX3Rlc3RzOgorICAgICAgICAgICAgICAgIHNlbGYuX21l dGVyLndyaXRlX3Rocm90dGxlZF91cGRhdGUoJ1slZC8lZF0gJXMlcycgJSAoc2VsZi5udW1fY29t cGxldGVkLCBzZWxmLm51bV90ZXN0cywgdGVzdF9uYW1lLCBzdWZmaXgpKQorICAgICAgICAgICAg c2VsZi5fY29tcGxldGVkX3Rlc3RzID0gW10KKyAgICAgICAgc2VsZi5fcnVubmluZ190ZXN0cy5y ZW1vdmUodGVzdF9uYW1lKQogCiAgICAgZGVmIF9wcmludF90ZXN0X3RyYWNlKHNlbGYsIHJlc3Vs dCwgZXhwX3N0ciwgZ290X3N0cik6CiAgICAgICAgIHRlc3RfbmFtZSA9IHJlc3VsdC50ZXN0X25h bWUKLSAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgndHJhY2U6ICVzJyAlIHRlc3RfbmFtZSkK KyAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgnWyVkLyVkXSAlcycgJSAoc2VsZi5udW1fY29t cGxldGVkLCBzZWxmLm51bV90ZXN0cywgdGVzdF9uYW1lKSkKIAogICAgICAgICBiYXNlID0gc2Vs Zi5fcG9ydC5sb29rdXBfdmlydHVhbF90ZXN0X2Jhc2UodGVzdF9uYW1lKQogICAgICAgICBpZiBi YXNlOgpAQCAtMzU5LDIwICszOTAsNiBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAKICAgICBk ZWYgX3ByaW50X3Byb2dyZXNzKHNlbGYsIHJlc3VsdF9zdW1tYXJ5LCByZXRyeWluZywgdGVzdF9s aXN0KToKICAgICAgICAgIiIiUHJpbnQgcHJvZ3Jlc3MgdGhyb3VnaCB0aGUgdGVzdHMgYXMgZGV0 ZXJtaW5lZCBieSAtLXByaW50LiIiIgotICAgICAgICBpZiByZXN1bHRfc3VtbWFyeS5yZW1haW5p bmcgPT0gMDoKLSAgICAgICAgICAgIHNlbGYuX21ldGVyLndyaXRlX3VwZGF0ZSgnJykKLSAgICAg ICAgICAgIHJldHVybgotCi0gICAgICAgIHBlcmNlbnRfY29tcGxldGUgPSAxMDAgKiAocmVzdWx0 X3N1bW1hcnkuZXhwZWN0ZWQgKwotICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3Rl ZCkgLyByZXN1bHRfc3VtbWFyeS50b3RhbAotICAgICAgICBhY3Rpb24gPSAiVGVzdGluZyIKLSAg ICAgICAgaWYgcmV0cnlpbmc6Ci0gICAgICAgICAgICBhY3Rpb24gPSAiUmV0cnlpbmciCi0KLSAg ICAgICAgc2VsZi5fbWV0ZXIud3JpdGVfdGhyb3R0bGVkX3VwZGF0ZSgiJXMgKCVkJSUpOiAlZCBy YW4gYXMgZXhwZWN0ZWQsICVkIGRpZG4ndCwgJWQgbGVmdCIgJQotICAgICAgICAgICAgKGFjdGlv biwgcGVyY2VudF9jb21wbGV0ZSwgcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWQsCi0gICAgICAgICAg ICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZCwgcmVzdWx0X3N1bW1hcnkucmVtYWluaW5nKSkK LQogICAgIGRlZiBfcHJpbnRfdW5leHBlY3RlZF9yZXN1bHRzKHNlbGYsIHVuZXhwZWN0ZWRfcmVz dWx0cyk6CiAgICAgICAgICMgUHJpbnRzIHRvIHRoZSBidWlsZGJvdCBzdHJlYW0KICAgICAgICAg cGFzc2VzID0ge30KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkKaW5kZXggNTY0ODI2Y2JjNGU1 OWQ4ZWQwMTk0NTEyNDA2MmU3OWU0YTRlYzQ5NS4uMTdmYzRiOWEzZjU2MTAxMDQxMmY2MDZiYjkw NGY3OTYxYWRmNWMyZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkKQEAgLTI1MSw3ICsy NTEsOCBAQCBCVUdYIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGltZW91dC5odG1sID0gVElNRU9VVAog ICAgIGRlZiB0ZXN0X2RldGFpbHMoc2VsZik6CiAgICAgICAgIHByaW50ZXIsIGVyciwgXyA9IHNl bGYuZ2V0X3ByaW50ZXIoWyctLWRldGFpbHMnXSkKICAgICAgICAgcmVzdWx0ID0gc2VsZi5nZXRf cmVzdWx0KCdwYXNzZXMvaW1hZ2UuaHRtbCcpCi0gICAgICAgIHByaW50ZXIuX3ByaW50X3Rlc3Rf cmVzdWx0KHJlc3VsdCwgZXhwZWN0ZWQ9RmFsc2UsIGV4cF9zdHI9JycsIGdvdF9zdHI9JycpCisg ICAgICAgIHByaW50ZXIucHJpbnRfc3RhcnRlZF90ZXN0KCdwYXNzZXMvaW1hZ2UuaHRtbCcpCisg ICAgICAgIHByaW50ZXIucHJpbnRfZmluaXNoZWRfdGVzdChyZXN1bHQsIGV4cGVjdGVkPUZhbHNl LCBleHBfc3RyPScnLCBnb3Rfc3RyPScnKQogICAgICAgICBzZWxmLmFzc2VydE5vdEVtcHR5KGVy cikKIAogCg== 157547 2012-08-09 14:24:54 -0700 2012-08-09 14:27:47 -0700 fix typo in layout_test_runner_unittest.py bug-93563-20120809142427.patch text/plain 10894 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MTE1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTAwZDg4OWE5M2ViZGQ1ZDlhYzg4NThkMjk2ZjMwM2Rh OTBkNzI5ZC4uNmY1ZGQxZjA1NzVlZmM0OTNlZjlhNThmOGE2YWI4ZWM1MzcxOWE4OCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU5 IEBACiAyMDEyLTA4LTA4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IHNob3VsZCBsb2cgcHJvZ3Jlc3MgbGlrZSBuaW5qYSBkb2VzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzU2MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgY2hhbmdlIG1vZGlm aWVzIHRoZSBvdXRwdXQgb2YgbnJ3dCBpbiB0aGUKKyAgICAgICAgbm9uLS1kZWJ1Zy1yd3QtbG9n Z2luZyBtb2Rlcy4KKworICAgICAgICBJbiBub24tdmVyYm9zZSBtb2RlLCB0aGUgb3V0cHV0IGNo YW5nZXMgZnJvbToKKyAgICAgICAgICAiVGVzdGluZyAoNTAlKTogOTYgcmFuIGFzIGV4cGVjdGVk LCA0IGRpZG4ndCwgMTAwIGxlZnQiCisgICAgICAgIHRvOgorICAgICAgICAgICJbMTAwLzIwMF0g Zm9vLmh0bWwgKCs0KSIKKyAgICAgICAgb3I6CisgICAgICAgICAgIlsxMDAvMjAwXSBmb28uaHRt bCBmYWlsZWQgIHVuZXhwZWN0ZWRseSAodGV4dCBkaWZmKSIKKworICAgICAgICB3aGljaCBpbmRp Y2F0ZXMgdGhlIGVhcmxpZXN0IHRlc3QgY3VycmVudGx5IHJ1bm5pbmcgKG9wdGlvbmFsbHkgcGx1 cyB0aGUKKyAgICAgICAgY291bnQgb2Ygb3RoZXIgY3VycmVudGx5LWV4ZWN1dGluZyB0ZXN0cyBp ZiB3ZSdyZSBydW5uaW5nIHRlc3RzIGluIHBhcmFsbGVsKQorICAgICAgICBvciB0aGUgcmVzdWx0 IG9mIHNhaWQgdGVzdC4KKworICAgICAgICBJZiB0aGUgdGVzdCBwcm9kdWNlcyB1bmV4cGVjdGVk IHJlc3VsdHMsIHRoYXQgbGluZSBpcyBmbHVzaGVkCisgICAgICAgIHJhdGhlciB0aGFuIGVyYXNl ZCAoc28gd2Ugbm8gbG9uZ2VyIG5lZWQgdGhlICVkIGRpZG4ndCBydW5uaW5nCisgICAgICAgIHRh bGx5KS4KKworICAgICAgICBJbiAtLXZlcmJvc2UgbW9kZSwgdGhlIG91dHB1dCBpcyBzaW1pbGFy LCBidXQgZXZlcnkgdGVzdCBnZXRzIGEKKyAgICAgICAgbGluZSAoYW5kIHRlc3RzIGFyZSBsb2dn ZWQgaW4gb3JkZXIgb2YgdGhlbSBiZWluZyBzdGFydGVkLCBub3QKKyAgICAgICAgb3JkZXIgb2Yg dGhlbSBiZWluZyBjb21wbGV0ZWQpIChhbmQgaW4gLS1kZXRhaWxzIG1vZGUsIHRoZQorICAgICAg ICBmaXJzdCBsaW5lIG9mIGVhY2ggdGVzdCBtYXRjaGVzIC0tdmVyYm9zZSBidXQgdGhlIG90aGVy IGxpbmVzCisgICAgICAgIGFyZSB1bmNoYW5nZWQpLgorICAgICAgICAKKyAgICAgICAgVGhlIG92 ZXJhbGwgcmVzdWx0IHNob3VsZCBiZSBlYXNpZXIgdG8gcmVhZCBhbmQgaXMgc2ltcGxlciB0bwor ICAgICAgICBpbXBsZW1lbnQgYXMgd2VsbCAoYXBhcnQgZnJvbSBtYW5hZ2luZyB0aGUgbnVtYmVy IG9mIHRlc3RzIHRoYXQKKyAgICAgICAgaGF2ZSBzdGFydGVkIGJ1dCBub3QgY29tcGxldGVkLCB3 aGljaCBpcyBzbGlnaHRseSBhbm5veWluZykuCisKKyAgICAgICAgVGhpcyBhbHNvIG1hdGNoZXMg dGhlIG91dHB1dCBzdHlsZSBmb3IgdGVzdC13ZWJraXRweSwgbW9yZS1vci1sZXNzLgorCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rl c3RfcnVubmVyLnB5OgorICAgICAgICAoTGF5b3V0VGVzdFJ1bm5lci5ydW5fdGVzdHMpOgorICAg ICAgICAoTGF5b3V0VGVzdFJ1bm5lci5fdXBkYXRlX3N1bW1hcnlfd2l0aF9yZXN1bHQpOgorICAg ICAgICAoTGF5b3V0VGVzdFJ1bm5lci5faGFuZGxlX3N0YXJ0ZWRfdGVzdCk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVu bmVyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRmFrZVByaW50ZXIpOgorICAgICAgICAoRmFrZVBy aW50ZXIucHJpbnRfc3RhcnRlZF90ZXN0KToKKyAgICAgICAgKEZha2VQcmludGVyLnByaW50X2Zp bmlzaGVkX3Rlc3QpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Zp ZXdzL3ByaW50aW5nLnB5OgorICAgICAgICAoUHJpbnRlci5fX2luaXRfXyk6CisgICAgICAgIChQ cmludGVyLnByaW50X3N0YXJ0ZWRfdGVzdCk6CisgICAgICAgIChQcmludGVyLnByaW50X2Zpbmlz aGVkX3Rlc3QpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfdGVzdF90cmFjZSk6CisgICAgICAg IChQcmludGVyLl9wcmludF9wcm9ncmVzcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHk6CisgICAgICAgICh0ZXN0X2Rl dGFpbHMpOgorCisyMDEyLTA4LTA4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3Jn PgorCiAgICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lLWV4cGVjdGF0aW9ucyBuZWVkcyB0 byBzdXBwb3J0IG11bHRpcGxlIGV4cGVjdGF0aW9ucyBmaWxlcwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkwNTEKIApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVu bmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bGF5b3V0X3Rlc3RfcnVubmVyLnB5CmluZGV4IGQyMTRjMjFiYzNiMzQ1YzIwOGMzNzQ4MTQwNTY5 NjM3ZTkzOTZhZDUuLmFlMzQyMjU2MWUxZDA3OTFjY2YwOGQ2NTM2MGNiNzhmMjAxM2M2ZjkgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L2xheW91dF90ZXN0X3J1bm5lci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXIucHkKQEAgLTEwMSw2ICsxMDEs OCBAQCBjbGFzcyBMYXlvdXRUZXN0UnVubmVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX25lZWRz X3dlYnNvY2tldHMgPSBuZWVkc193ZWJzb2NrZXRzCiAgICAgICAgIHNlbGYuX3JldHJ5aW5nID0g cmV0cnlpbmcKICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0gW3Rlc3RfaW5wdXQudGVz dF9uYW1lIGZvciB0ZXN0X2lucHV0IGluIHRlc3RfaW5wdXRzXQorICAgICAgICBzZWxmLl9wcmlu dGVyLm51bV90ZXN0cyA9IGxlbihzZWxmLl90ZXN0X2ZpbGVzX2xpc3QpCisgICAgICAgIHNlbGYu X3ByaW50ZXIubnVtX2NvbXBsZXRlZCA9IDAKIAogICAgICAgICBzZWxmLl9hbGxfcmVzdWx0cyA9 IFtdCiAgICAgICAgIHNlbGYuX2dyb3VwX3N0YXRzID0ge30KQEAgLTIwMiw4ICsyMDQsNyBAQCBj bGFzcyBMYXlvdXRUZXN0UnVubmVyKG9iamVjdCk6CiAKICAgICAgICAgcmVzdWx0X3N1bW1hcnku YWRkKHJlc3VsdCwgZXhwZWN0ZWQsIHNlbGYuX3Rlc3RfaXNfc2xvdyhyZXN1bHQudGVzdF9uYW1l KSkKIAotICAgICAgICAjIEZJWE1FOiB0aGVyZSdzIHRvbyBtYW55IGFyZ3VtZW50cyB0byB0aGlz IGZ1bmN0aW9uLgotICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2ZpbmlzaGVkX3Rlc3QocmVz dWx0LCBleHBlY3RlZCwgZXhwX3N0ciwgZ290X3N0ciwgcmVzdWx0X3N1bW1hcnksIHNlbGYuX3Jl dHJ5aW5nLCBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QpCisgICAgICAgIHNlbGYuX3ByaW50ZXIucHJp bnRfZmluaXNoZWRfdGVzdChyZXN1bHQsIGV4cGVjdGVkLCBleHBfc3RyLCBnb3Rfc3RyKQogCiAg ICAgICAgIHNlbGYuX2ludGVycnVwdF9pZl9hdF9mYWlsdXJlX2xpbWl0cyhyZXN1bHRfc3VtbWFy eSkKIApAQCAtMjM3LDggKzIzOCw3IEBAIGNsYXNzIExheW91dFRlc3RSdW5uZXIob2JqZWN0KToK ICAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoJ3Vua25vd24gbWVzc2FnZSAlcyByZWNlaXZl ZCBmcm9tICVzLCBhcmdzPSVzJyAlIChuYW1lLCBzb3VyY2UsIHJlcHIoYXJncykpKQogCiAgICAg ZGVmIF9oYW5kbGVfc3RhcnRlZF90ZXN0KHNlbGYsIHdvcmtlcl9uYW1lLCB0ZXN0X2lucHV0LCB0 ZXN0X3RpbWVvdXRfc2VjKToKLSAgICAgICAgIyBGSVhNRTogbG9nIHRoYXQgd2UndmUgc3RhcnRl ZCBhbm90aGVyIHRlc3QuCi0gICAgICAgIHBhc3MKKyAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF9zdGFydGVkX3Rlc3QodGVzdF9pbnB1dC50ZXN0X25hbWUpCiAKICAgICBkZWYgX2hhbmRsZV9m aW5pc2hlZF90ZXN0X2xpc3Qoc2VsZiwgd29ya2VyX25hbWUsIGxpc3RfbmFtZSwgbnVtX3Rlc3Rz LCBlbGFwc2VkX3RpbWUpOgogICAgICAgICBzZWxmLl9ncm91cF9zdGF0c1tsaXN0X25hbWVdID0g KG51bV90ZXN0cywgZWxhcHNlZF90aW1lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5b3V0X3Rlc3RfcnVubmVyX3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbGF5 b3V0X3Rlc3RfcnVubmVyX3VuaXR0ZXN0LnB5CmluZGV4IDIwODMyMjFjZTg3YjI1MjcyYjFhMWNh Y2Y5MWQ3OWM0YjAyNmQwODAuLjRkZDJhZTdhZTgyYzk0OTg2ODZkMDg1NjIzZGEyNTM3OGM5M2I0 NDIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL2xheW91dF90ZXN0X3J1bm5lcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9sYXlvdXRfdGVzdF9ydW5uZXJfdW5p dHRlc3QucHkKQEAgLTQ0LDEwICs0NCwxNiBAQCBUZXN0RXhwZWN0YXRpb25zID0gdGVzdF9leHBl Y3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucwogCiAKIGNsYXNzIEZha2VQcmludGVyKG9iamVjdCk6 CisgICAgbnVtX2NvbXBsZXRlZCA9IDAKKyAgICBudW1fdGVzdHMgPSAwCisKICAgICBkZWYgcHJp bnRfd29ya2Vyc19hbmRfc2hhcmRzKHNlbGYsIG51bV93b3JrZXJzLCBudW1fc2hhcmRzLCBudW1f bG9ja2VkX3NoYXJkcyk6CiAgICAgICAgIHBhc3MKIAotICAgIGRlZiBwcmludF9maW5pc2hlZF90 ZXN0KHNlbGYsIHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdvdF9zdHIsIHJlc3VsdF9zdW1t YXJ5LCByZXRyeWluZywgdGVzdF9uYW1lcyk6CisgICAgZGVmIHByaW50X3N0YXJ0ZWRfdGVzdChz ZWxmLCB0ZXN0X25hbWUpOgorICAgICAgICBwYXNzCisKKyAgICBkZWYgcHJpbnRfZmluaXNoZWRf dGVzdChzZWxmLCByZXN1bHQsIGV4cGVjdGVkLCBleHBfc3RyLCBnb3Rfc3RyKToKICAgICAgICAg cGFzcwogCiAgICAgZGVmIHdyaXRlKHNlbGYsIG1zZyk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CmluZGV4IDJlZjJlM2Zh NzlkNTdmNDIyOGNmOWNjNjgxYWZhZWM2ZWNkM2RmNzMuLmMyM2ZkN2Q0MGNmNmIyOGMxMWFmYTRk M2NiMDc2OGU5NWI3ZTVlYmQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CkBAIC02OCwxMCArNjgsMTQgQEAgY2xhc3Mg UHJpbnRlcihvYmplY3QpOgogICAgIEJ5IGRlZmF1bHQgdGhlIGJ1aWxkYm90LXBhcnNlZCBjb2Rl IGdldHMgbG9nZ2VkIHRvIHN0ZG91dCwgYW5kIHJlZ3VsYXIKICAgICBvdXRwdXQgZ2V0cyBsb2dn ZWQgdG8gc3RkZXJyLiIiIgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBvcHRpb25zLCBy ZWd1bGFyX291dHB1dCwgYnVpbGRib3Rfb3V0cHV0LCBsb2dnZXI9Tm9uZSk6CisgICAgICAgIHNl bGYubnVtX2NvbXBsZXRlZCA9IDAKKyAgICAgICAgc2VsZi5udW1fdGVzdHMgPSAwCiAgICAgICAg IHNlbGYuX3BvcnQgPSBwb3J0CiAgICAgICAgIHNlbGYuX29wdGlvbnMgPSBvcHRpb25zCiAgICAg ICAgIHNlbGYuX2J1aWxkYm90X3N0cmVhbSA9IGJ1aWxkYm90X291dHB1dAogICAgICAgICBzZWxm Ll9tZXRlciA9IE1ldGVyZWRTdHJlYW0ocmVndWxhcl9vdXRwdXQsIG9wdGlvbnMuZGVidWdfcnd0 X2xvZ2dpbmcsIGxvZ2dlcj1sb2dnZXIpCisgICAgICAgIHNlbGYuX3J1bm5pbmdfdGVzdHMgPSBb XQorICAgICAgICBzZWxmLl9jb21wbGV0ZWRfdGVzdHMgPSBbXQogCiAgICAgZGVmIGNsZWFudXAo c2VsZik6CiAgICAgICAgIHNlbGYuX21ldGVyLmNsZWFudXAoKQpAQCAtMzIwLDIwICszMjQsNDcg QEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICBzZWxmLl9wcmludF9xdWlldChzdW1t YXJ5KQogICAgICAgICBzZWxmLl9wcmludF9xdWlldCgiIikKIAotICAgIGRlZiBwcmludF9maW5p c2hlZF90ZXN0KHNlbGYsIHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdvdF9zdHIsIHJlc3Vs dF9zdW1tYXJ5LCByZXRyeWluZywgdGVzdF9maWxlc19saXN0KToKLSAgICAgICAgc2VsZi5fcHJp bnRfdGVzdF9yZXN1bHQocmVzdWx0LCBleHBlY3RlZCwgZXhwX3N0ciwgZ290X3N0cikKLSAgICAg ICAgc2VsZi5fcHJpbnRfcHJvZ3Jlc3MocmVzdWx0X3N1bW1hcnksIHJldHJ5aW5nLCB0ZXN0X2Zp bGVzX2xpc3QpCisgICAgZGVmIHByaW50X3N0YXJ0ZWRfdGVzdChzZWxmLCB0ZXN0X25hbWUpOgor ICAgICAgICBzZWxmLl9ydW5uaW5nX3Rlc3RzLmFwcGVuZCh0ZXN0X25hbWUpCisgICAgICAgIGlm IGxlbihzZWxmLl9ydW5uaW5nX3Rlc3RzKSA+IDE6CisgICAgICAgICAgICBzdWZmaXggPSAnICgr JWQpJyAlIChsZW4oc2VsZi5fcnVubmluZ190ZXN0cykgLSAxKQorICAgICAgICBlbHNlOgorICAg ICAgICAgICAgc3VmZml4ID0gJycKKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy52ZXJib3NlOgor ICAgICAgICAgICAgd3JpdGUgPSBzZWxmLl9tZXRlci53cml0ZV91cGRhdGUKKyAgICAgICAgZWxz ZToKKyAgICAgICAgICAgIHdyaXRlID0gc2VsZi5fbWV0ZXIud3JpdGVfdGhyb3R0bGVkX3VwZGF0 ZQorICAgICAgICB3cml0ZSgnWyVkLyVkXSAlcyVzJyAlIChzZWxmLm51bV9jb21wbGV0ZWQsIHNl bGYubnVtX3Rlc3RzLCB0ZXN0X25hbWUsIHN1ZmZpeCkpCiAKLSAgICBkZWYgX3ByaW50X3Rlc3Rf cmVzdWx0KHNlbGYsIHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdvdF9zdHIpOgorICAgIGRl ZiBwcmludF9maW5pc2hlZF90ZXN0KHNlbGYsIHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIsIGdv dF9zdHIpOgorICAgICAgICBzZWxmLm51bV9jb21wbGV0ZWQgKz0gMQorICAgICAgICB0ZXN0X25h bWUgPSByZXN1bHQudGVzdF9uYW1lCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuZGV0YWlsczoK ICAgICAgICAgICAgIHNlbGYuX3ByaW50X3Rlc3RfdHJhY2UocmVzdWx0LCBleHBfc3RyLCBnb3Rf c3RyKQogICAgICAgICBlbGlmIChzZWxmLl9vcHRpb25zLnZlcmJvc2UgYW5kIG5vdCBzZWxmLl9v cHRpb25zLmRlYnVnX3J3dF9sb2dnaW5nKSBvciBub3QgZXhwZWN0ZWQ6CiAgICAgICAgICAgICBk ZXNjID0gVGVzdEV4cGVjdGF0aW9ucy5FWFBFQ1RBVElPTl9ERVNDUklQVElPTlNbcmVzdWx0LnR5 cGVdCi0gICAgICAgICAgICBzZWxmLndyaXRlbG4oIiVzICVzJXMlcyIgJSAocmVzdWx0LnRlc3Rf bmFtZSwgZGVzY1sxXSwgIiIgaWYgZXhwZWN0ZWQgZWxzZSAiIHVuZXhwZWN0ZWRseSIsIGRlc2Nb Ml0pKQorICAgICAgICAgICAgc3VmZml4ID0gJyAnICsgZGVzY1sxXQorICAgICAgICAgICAgaWYg bm90IGV4cGVjdGVkOgorICAgICAgICAgICAgICAgIHN1ZmZpeCArPSAnIHVuZXhwZWN0ZWRseScg KyBkZXNjWzJdCisgICAgICAgICAgICBzZWxmLndyaXRlbG4oIlslZC8lZF0gJXMlcyIgJSAoc2Vs Zi5udW1fY29tcGxldGVkLCBzZWxmLm51bV90ZXN0cywgdGVzdF9uYW1lLCBzdWZmaXgpKQorICAg ICAgICBlbGlmIHNlbGYubnVtX2NvbXBsZXRlZCA9PSBzZWxmLm51bV90ZXN0czoKKyAgICAgICAg ICAgIHNlbGYuX21ldGVyLndyaXRlX3VwZGF0ZSgnJykKKyAgICAgICAgZWxzZToKKyAgICAgICAg ICAgIGRlc2MgPSBUZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OX0RFU0NSSVBUSU9OU1tyZXN1 bHQudHlwZV0KKyAgICAgICAgICAgIHN1ZmZpeCA9ICcgJyArIGRlc2NbMV0KKyAgICAgICAgICAg IGlmIHRlc3RfbmFtZSA9PSBzZWxmLl9ydW5uaW5nX3Rlc3RzWzBdOgorICAgICAgICAgICAgICAg IHNlbGYuX2NvbXBsZXRlZF90ZXN0cy5pbnNlcnQoMCwgW3Rlc3RfbmFtZSwgc3VmZml4XSkKKyAg ICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgc2VsZi5fY29tcGxldGVkX3Rlc3RzLmFw cGVuZChbdGVzdF9uYW1lLCBzdWZmaXhdKQorCisgICAgICAgICAgICBmb3IgdGVzdF9uYW1lLCBz dWZmaXggaW4gc2VsZi5fY29tcGxldGVkX3Rlc3RzOgorICAgICAgICAgICAgICAgIHNlbGYuX21l dGVyLndyaXRlX3Rocm90dGxlZF91cGRhdGUoJ1slZC8lZF0gJXMlcycgJSAoc2VsZi5udW1fY29t cGxldGVkLCBzZWxmLm51bV90ZXN0cywgdGVzdF9uYW1lLCBzdWZmaXgpKQorICAgICAgICAgICAg c2VsZi5fY29tcGxldGVkX3Rlc3RzID0gW10KKyAgICAgICAgc2VsZi5fcnVubmluZ190ZXN0cy5y ZW1vdmUodGVzdF9uYW1lKQogCiAgICAgZGVmIF9wcmludF90ZXN0X3RyYWNlKHNlbGYsIHJlc3Vs dCwgZXhwX3N0ciwgZ290X3N0cik6CiAgICAgICAgIHRlc3RfbmFtZSA9IHJlc3VsdC50ZXN0X25h bWUKLSAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgndHJhY2U6ICVzJyAlIHRlc3RfbmFtZSkK KyAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgnWyVkLyVkXSAlcycgJSAoc2VsZi5udW1fY29t cGxldGVkLCBzZWxmLm51bV90ZXN0cywgdGVzdF9uYW1lKSkKIAogICAgICAgICBiYXNlID0gc2Vs Zi5fcG9ydC5sb29rdXBfdmlydHVhbF90ZXN0X2Jhc2UodGVzdF9uYW1lKQogICAgICAgICBpZiBi YXNlOgpAQCAtMzU5LDIwICszOTAsNiBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAKICAgICBk ZWYgX3ByaW50X3Byb2dyZXNzKHNlbGYsIHJlc3VsdF9zdW1tYXJ5LCByZXRyeWluZywgdGVzdF9s aXN0KToKICAgICAgICAgIiIiUHJpbnQgcHJvZ3Jlc3MgdGhyb3VnaCB0aGUgdGVzdHMgYXMgZGV0 ZXJtaW5lZCBieSAtLXByaW50LiIiIgotICAgICAgICBpZiByZXN1bHRfc3VtbWFyeS5yZW1haW5p bmcgPT0gMDoKLSAgICAgICAgICAgIHNlbGYuX21ldGVyLndyaXRlX3VwZGF0ZSgnJykKLSAgICAg ICAgICAgIHJldHVybgotCi0gICAgICAgIHBlcmNlbnRfY29tcGxldGUgPSAxMDAgKiAocmVzdWx0 X3N1bW1hcnkuZXhwZWN0ZWQgKwotICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3Rl ZCkgLyByZXN1bHRfc3VtbWFyeS50b3RhbAotICAgICAgICBhY3Rpb24gPSAiVGVzdGluZyIKLSAg ICAgICAgaWYgcmV0cnlpbmc6Ci0gICAgICAgICAgICBhY3Rpb24gPSAiUmV0cnlpbmciCi0KLSAg ICAgICAgc2VsZi5fbWV0ZXIud3JpdGVfdGhyb3R0bGVkX3VwZGF0ZSgiJXMgKCVkJSUpOiAlZCBy YW4gYXMgZXhwZWN0ZWQsICVkIGRpZG4ndCwgJWQgbGVmdCIgJQotICAgICAgICAgICAgKGFjdGlv biwgcGVyY2VudF9jb21wbGV0ZSwgcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWQsCi0gICAgICAgICAg ICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZCwgcmVzdWx0X3N1bW1hcnkucmVtYWluaW5nKSkK LQogICAgIGRlZiBfcHJpbnRfdW5leHBlY3RlZF9yZXN1bHRzKHNlbGYsIHVuZXhwZWN0ZWRfcmVz dWx0cyk6CiAgICAgICAgICMgUHJpbnRzIHRvIHRoZSBidWlsZGJvdCBzdHJlYW0KICAgICAgICAg cGFzc2VzID0ge30KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkKaW5kZXggNTY0ODI2Y2JjNGU1 OWQ4ZWQwMTk0NTEyNDA2MmU3OWU0YTRlYzQ5NS4uMTdmYzRiOWEzZjU2MTAxMDQxMmY2MDZiYjkw NGY3OTYxYWRmNWMyZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkKQEAgLTI1MSw3ICsy NTEsOCBAQCBCVUdYIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGltZW91dC5odG1sID0gVElNRU9VVAog ICAgIGRlZiB0ZXN0X2RldGFpbHMoc2VsZik6CiAgICAgICAgIHByaW50ZXIsIGVyciwgXyA9IHNl bGYuZ2V0X3ByaW50ZXIoWyctLWRldGFpbHMnXSkKICAgICAgICAgcmVzdWx0ID0gc2VsZi5nZXRf cmVzdWx0KCdwYXNzZXMvaW1hZ2UuaHRtbCcpCi0gICAgICAgIHByaW50ZXIuX3ByaW50X3Rlc3Rf cmVzdWx0KHJlc3VsdCwgZXhwZWN0ZWQ9RmFsc2UsIGV4cF9zdHI9JycsIGdvdF9zdHI9JycpCisg ICAgICAgIHByaW50ZXIucHJpbnRfc3RhcnRlZF90ZXN0KCdwYXNzZXMvaW1hZ2UuaHRtbCcpCisg ICAgICAgIHByaW50ZXIucHJpbnRfZmluaXNoZWRfdGVzdChyZXN1bHQsIGV4cGVjdGVkPUZhbHNl LCBleHBfc3RyPScnLCBnb3Rfc3RyPScnKQogICAgICAgICBzZWxmLmFzc2VydE5vdEVtcHR5KGVy cikKIAogCg==