33238 2010-01-05 17:06:06 -0800 run-webkit-tests should catch control-C and offer to show you the failures/diffs so far 2010-05-28 17:14:23 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric dpranke ap dpranke jamesr oldest_to_newest 177469 0 eric 2010-01-05 17:06:06 -0800 run-webkit-tests should catch control-C and offer to show you the failures/diffs so far I would find this useful. If we don't implement it in the perl version we should be sure to add it to the python version once it's upstream. 177529 1 ap 2010-01-05 20:02:10 -0800 That would be awesome! 229211 2 56771 dpranke 2010-05-21 19:01:49 -0700 Created attachment 56771 Patch 229212 3 dpranke 2010-05-21 19:04:28 -0700 Patch added. Note that I decided that prompting the user would just be annoying, so we go ahead and display the results we have. Also, this patch changes the code to explicitly catch a ctrl-C and call sys.exit(); if you don't do that, Python waits for all of the threads currently exiting to complete. If some threads are wedged and don't get the interrupt, the process hangs and can't be killed. 229213 4 dpranke 2010-05-21 19:05:27 -0700 (In reply to comment #3) > Patch added. Note that I decided that prompting the user would just be annoying, so we go ahead and display the results we have. Of course, if no tests have failed, there's nothing to display. Note that we can certainly change the behavior if it is annoying this way. 231985 5 56771 ojan 2010-05-28 15:50:52 -0700 Comment on attachment 56771 Patch This is a great change. WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py:290 + exp_str = str(expected) Both these abbreviations are hard to read. incomplete_str and expected_str are much more readable. WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:765 + not self._retrying and not interrupted): Nit: here and above, can you call this keyboard_interrupted? Makes it more clear what this means without having to trace back to where this was set. 232022 6 dpranke 2010-05-28 17:12:38 -0700 (In reply to comment #5) > (From update of attachment 56771 [details]) > This is a great change. > > WebKitTools/Scripts/webkitpy/layout_tests/layout_package/printing.py:290 > + exp_str = str(expected) > Both these abbreviations are hard to read. incomplete_str and expected_str are much more readable. > Done. > WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:765 > + not self._retrying and not interrupted): > Nit: here and above, can you call this keyboard_interrupted? Makes it more clear what this means without having to trace back to where this was set. Done. 232024 7 dpranke 2010-05-28 17:14:23 -0700 Committed r60381: <http://trac.webkit.org/changeset/60381> 56771 2010-05-21 19:01:49 -0700 2010-05-28 15:50:52 -0700 Patch bug-33238-20100521190148.patch text/plain 13070 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBiZWU1MWU5M2Y2NGMzYWFiZDIwZmUyYWU2YzlhMzUyZGY3MDAzOGUwLi5mNGU0NjA5 NzQ0ODU2ODMwNmM3NzRkM2JhOThjNDU1OGQ0YWZlOTViIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAK KzIwMTAtMDUtMjEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQt dGVzdHM6IGZpeCBoYW5kbGluZyBvZiBDdHJsLUMgdG8gZXhpdCBldmVuIGlmIHNvbWUKKyAgICAg ICAgdGhyZWFkcyBhcmUgd2VkZ2VkLiBBbHNvLCB0aGUgc2NyaXB0IHdpbGwgcHJpbnQgdGhlIHJl c3VsdHMgb2YgdGhlCisgICAgICAgIHRlc3RzIGNvbXBsZXRlZCB3aGVuIHRoZSBpbnRlcnJ1cHQg b2NjdXJzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMzIzOAorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmdf dW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weToKKwogMjAxMC0wNS0xOSAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCBidWlsZCBmaXguCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL25ldy1ydW4td2Via2l0LXRlc3RzIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy9uZXctcnVuLXdlYmtpdC10ZXN0cwppbmRleCAwNzI4ZWUwYTBmNDM4OGVhOTUzMzNk Yjc2NDJlNzk5M2IyM2FmODNlLi45ZmNhY2FhOWQ4NDFiMDFmMTY0Nzg3NjlhYWQ2ODFmYmNjZGI1 NDRkIDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL25ldy1ydW4td2Via2l0LXRlc3Rz CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbmV3LXJ1bi13ZWJraXQtdGVzdHMKQEAgLTI4LDkg KzI4LDE0IEBACiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9T U0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKICIiIldyYXBwZXIgYXJvdW5kIHdlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IiIiCitpbXBvcnQgc2lnbmFsCiBpbXBvcnQg c3lzCiAKIGltcG9ydCB3ZWJraXRweS5sYXlvdXRfdGVzdHMucnVuX3dlYmtpdF90ZXN0cyBhcyBy dW5fd2Via2l0X3Rlc3RzCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAgc3lzLmV4 aXQocnVuX3dlYmtpdF90ZXN0cy5tYWluKCkpCisgICAgdHJ5OgorICAgICAgICBzeXMuZXhpdChy dW5fd2Via2l0X3Rlc3RzLm1haW4oKSkKKyAgICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6Cisg ICAgICAgICMgdGhpcyBtaXJyb3JzIHdoYXQgdGhlIHNoZWxsIG5vcm1hbGx5IGRvZXMKKyAgICAg ICAgc3lzLmV4aXQoc2lnbmFsLlNJR0lOVCArIDEyOCkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVy X3RyZWVfdGhyZWFkLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHkKaW5kZXggMDlmOWFj Nzk5MjRiYjY5MDYyMmNhMDEwMmQxMDZmNGMwNmY1MTI0Zi4uYTJlMjA5MTY3ZGM2ZDljNGEyMGU5 NzI4NDA4ZjQ0YjI5MjMxYjBhNCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHkKQEAgLTI1OCw2ICsyNTgsOSBAQCBj bGFzcyBUZXN0U2hlbGxUaHJlYWQodGhyZWFkaW5nLlRocmVhZCk6CiAgICAgICAgICAgICBzZWxm Ll9ydW4odGVzdF9ydW5uZXI9Tm9uZSwgcmVzdWx0X3N1bW1hcnk9Tm9uZSkKICAgICAgICAgICAg IF9sb2cuZGVidWcoJyVzIGRvbmUgKCVkIHRlc3RzKScgJSAoc2VsZi5nZXROYW1lKCksCiAgICAg ICAgICAgICAgICAgICAgICAgIHNlbGYuZ2V0X251bV90ZXN0cygpKSkKKyAgICAgICAgZXhjZXB0 IEtleWJvYXJkSW50ZXJydXB0OgorICAgICAgICAgICAgc2VsZi5fZXhjZXB0aW9uX2luZm8gPSBz eXMuZXhjX2luZm8oKQorICAgICAgICAgICAgX2xvZy5kZWJ1ZygiJXMgaW50ZXJydXB0ZWQiICUg c2VsZi5nZXROYW1lKCkpCiAgICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgICMgU2F2ZSB0aGUg ZXhjZXB0aW9uIGZvciBvdXIgY2FsbGVyIHRvIHNlZS4KICAgICAgICAgICAgIHNlbGYuX2V4Y2Vw dGlvbl9pbmZvID0gc3lzLmV4Y19pbmZvKCkKQEAgLTI5OCw3ICszMDEsNyBAQCBjbGFzcyBUZXN0 U2hlbGxUaHJlYWQodGhyZWFkaW5nLlRocmVhZCk6CiAKICAgICAgICAgd2hpbGUgVHJ1ZToKICAg ICAgICAgICAgIGlmIHNlbGYuX2NhbmNlbGVkOgotICAgICAgICAgICAgICAgIF9sb2cuaW5mbygn VGVzdGluZyBjYW5jZWxlZCcpCisgICAgICAgICAgICAgICAgX2xvZy5kZWJ1ZygnVGVzdGluZyBj YW5jZWxsZWQnKQogICAgICAgICAgICAgICAgIHRlc3RzX3J1bl9maWxlLmNsb3NlKCkKICAgICAg ICAgICAgICAgICByZXR1cm4KIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvcHJpbnRpbmcucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5w eQppbmRleCA3N2RlMmUwMzZjYTBlYzJjYjU3YzBjMWJjYzQ4NGJiZjFmMjRmMDdiLi5jM2FiZTBm ZWU0MDM0MDI0NTJhMTdhNGVmM2U5YThhNWE5MDBhZWZhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmludGluZy5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS9wcmludGluZy5weQpAQCAtMjcyLDI0ICsyNzIsMzQgQEAgY2xhc3MgUHJpbnRlcihv YmplY3QpOgogICAgIGRlZiBwcmludF90aW1pbmcoc2VsZiwgbXNnKToKICAgICAgICAgc2VsZi53 cml0ZShtc2csICd0aW1pbmcnKQogCi0gICAgZGVmIHByaW50X29uZV9saW5lX3N1bW1hcnkoc2Vs ZiwgdG90YWwsIGV4cGVjdGVkKToKKyAgICBkZWYgcHJpbnRfb25lX2xpbmVfc3VtbWFyeShzZWxm LCB0b3RhbCwgZXhwZWN0ZWQsIHVuZXhwZWN0ZWQpOgogICAgICAgICAiIiJQcmludCBhIG9uZS1s aW5lIHN1bW1hcnkgb2YgdGhlIHRlc3QgcnVuIHRvIHN0ZG91dC4KIAogICAgICAgICBBcmdzOgog ICAgICAgICAgIHRvdGFsOiB0b3RhbCBudW1iZXIgb2YgdGVzdHMgcnVuCiAgICAgICAgICAgZXhw ZWN0ZWQ6IG51bWJlciBvZiBleHBlY3RlZCByZXN1bHRzCisgICAgICAgICAgdW5leHBlY3RlZDog bnVtYmVyIG9mIHVuZXhwZWN0ZWQgcmVzdWx0cwogICAgICAgICAiIiIKICAgICAgICAgaWYgc2Vs Zi5kaXNhYmxlZCgnb25lLWxpbmUtc3VtbWFyeScpOgogICAgICAgICAgICAgcmV0dXJuCiAKLSAg ICAgICAgdW5leHBlY3RlZCA9IHRvdGFsIC0gZXhwZWN0ZWQKKyAgICAgICAgaW5jb21wbGV0ZSA9 IHRvdGFsIC0gZXhwZWN0ZWQgLSB1bmV4cGVjdGVkCisgICAgICAgIGlmIGluY29tcGxldGU6Cisg ICAgICAgICAgICBzZWxmLl93cml0ZSgiIikKKyAgICAgICAgICAgIGluY19zdHIgPSAiICglZCBk aWRuJ3QgcnVuKSIgJSBpbmNvbXBsZXRlCisgICAgICAgICAgICBleHBfc3RyID0gc3RyKGV4cGVj dGVkKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgaW5jX3N0ciA9ICIiCisgICAgICAgICAg ICBleHBfc3RyID0gIkFsbCAlZCIgJSBleHBlY3RlZAorCiAgICAgICAgIGlmIHVuZXhwZWN0ZWQg PT0gMDoKLSAgICAgICAgICAgIHNlbGYuX3dyaXRlKCJBbGwgJWQgdGVzdHMgcmFuIGFzIGV4cGVj dGVkLiIgJSBleHBlY3RlZCkKKyAgICAgICAgICAgIHNlbGYuX3dyaXRlKCIlcyB0ZXN0cyByYW4g YXMgZXhwZWN0ZWQlcy4iICUgKGV4cF9zdHIsIGluY19zdHIpKQogICAgICAgICBlbGlmIGV4cGVj dGVkID09IDE6Ci0gICAgICAgICAgICBzZWxmLl93cml0ZSgiMSB0ZXN0IHJhbiBhcyBleHBlY3Rl ZCwgJWQgZGlkbid0OiIgJSB1bmV4cGVjdGVkKQorICAgICAgICAgICAgc2VsZi5fd3JpdGUoIjEg dGVzdCByYW4gYXMgZXhwZWN0ZWQsICVkIGRpZG4ndCVzOiIgJQorICAgICAgICAgICAgICAgICAg ICAgICAgKHVuZXhwZWN0ZWQsIGluY19zdHIpKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAg c2VsZi5fd3JpdGUoIiVkIHRlc3RzIHJhbiBhcyBleHBlY3RlZCwgJWQgZGlkbid0OiIgJQotICAg ICAgICAgICAgICAgICAgICAgICAgKGV4cGVjdGVkLCB1bmV4cGVjdGVkKSkKKyAgICAgICAgICAg IHNlbGYuX3dyaXRlKCIlZCB0ZXN0cyByYW4gYXMgZXhwZWN0ZWQsICVkIGRpZG4ndCVzOiIgJQor ICAgICAgICAgICAgICAgICAgICAgICAgKGV4cGVjdGVkLCB1bmV4cGVjdGVkLCBpbmNfc3RyKSkK ICAgICAgICAgc2VsZi5fd3JpdGUoIiIpCiAKICAgICBkZWYgcHJpbnRfdGVzdF9yZXN1bHQoc2Vs ZiwgcmVzdWx0LCBleHBlY3RlZCwgZXhwX3N0ciwgZ290X3N0cik6CmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9wcmlu dGluZ191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL2xheW91dF9wYWNrYWdlL3ByaW50aW5nX3VuaXR0ZXN0LnB5CmluZGV4IDM4MDQyMTAyMWU4 NzRkYjBjYTVhNTZhN2VkYWIzMzgwNWVkYTkzYWQuLmM4NjQ4YmNmYzg2ZjAwOGUzNDk0ZTkwNDg0 MTFjOGYxYmEyMDkwYzYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3ByaW50aW5nX3VuaXR0ZXN0LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3By aW50aW5nX3VuaXR0ZXN0LnB5CkBAIC0yMTUsMjcgKzIxNSwzNCBAQCBjbGFzcyAgVGVzdHByaW50 ZXIodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRlc3RfcHJpbnRfb25lX2xpbmVfc3Vt bWFyeShzZWxmKToKICAgICAgICAgcHJpbnRlciwgZXJyLCBvdXQgPSBzZWxmLmdldF9wcmludGVy KFsnLS1wcmludCcsICdub3RoaW5nJ10pCi0gICAgICAgIHByaW50ZXIucHJpbnRfb25lX2xpbmVf c3VtbWFyeSgxLCAxKQorICAgICAgICBwcmludGVyLnByaW50X29uZV9saW5lX3N1bW1hcnkoMSwg MSwgMCkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGVyci5lbXB0eSgpKQogCiAgICAgICAgIHBy aW50ZXIsIGVyciwgb3V0ID0gc2VsZi5nZXRfcHJpbnRlcihbJy0tcHJpbnQnLCAnb25lLWxpbmUt c3VtbWFyeSddKQotICAgICAgICBwcmludGVyLnByaW50X29uZV9saW5lX3N1bW1hcnkoMSwgMSkK KyAgICAgICAgcHJpbnRlci5wcmludF9vbmVfbGluZV9zdW1tYXJ5KDEsIDEsIDApCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKGVyci5nZXQoKSwgWyJBbGwgMSB0ZXN0cyByYW4gYXMgZXhwZWN0 ZWQuXG4iLCAiXG4iXSkKIAogICAgICAgICBwcmludGVyLCBlcnIsIG91dCA9IHNlbGYuZ2V0X3By aW50ZXIoWyctLXByaW50JywgJ2V2ZXJ5dGhpbmcnXSkKLSAgICAgICAgcHJpbnRlci5wcmludF9v bmVfbGluZV9zdW1tYXJ5KDEsIDEpCisgICAgICAgIHByaW50ZXIucHJpbnRfb25lX2xpbmVfc3Vt bWFyeSgxLCAxLCAwKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhlcnIuZ2V0KCksIFsiQWxs IDEgdGVzdHMgcmFuIGFzIGV4cGVjdGVkLlxuIiwgIlxuIl0pCiAKICAgICAgICAgZXJyLnJlc2V0 KCkKLSAgICAgICAgcHJpbnRlci5wcmludF9vbmVfbGluZV9zdW1tYXJ5KDIsIDEpCisgICAgICAg IHByaW50ZXIucHJpbnRfb25lX2xpbmVfc3VtbWFyeSgyLCAxLCAxKQogICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhlcnIuZ2V0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgIFsiMSB0ZXN0 IHJhbiBhcyBleHBlY3RlZCwgMSBkaWRuJ3Q6XG4iLCAiXG4iXSkKIAogICAgICAgICBlcnIucmVz ZXQoKQotICAgICAgICBwcmludGVyLnByaW50X29uZV9saW5lX3N1bW1hcnkoMywgMikKKyAgICAg ICAgcHJpbnRlci5wcmludF9vbmVfbGluZV9zdW1tYXJ5KDMsIDIsIDEpCiAgICAgICAgIHNlbGYu YXNzZXJ0RXF1YWxzKGVyci5nZXQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgWyIyIHRl c3RzIHJhbiBhcyBleHBlY3RlZCwgMSBkaWRuJ3Q6XG4iLCAiXG4iXSkKIAorICAgICAgICBlcnIu cmVzZXQoKQorICAgICAgICBwcmludGVyLnByaW50X29uZV9saW5lX3N1bW1hcnkoMywgMiwgMCkK KyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXJyLmdldCgpLAorICAgICAgICAgICAgICAgICAg ICAgICAgICBbJ1xuJywgIjIgdGVzdHMgcmFuIGFzIGV4cGVjdGVkICgxIGRpZG4ndCBydW4pLlxu IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICdcbiddKQorCisKICAgICBkZWYgdGVzdF9w cmludF90ZXN0X3Jlc3VsdChzZWxmKToKICAgICAgICAgcmVzdWx0ID0gZ2V0X3Jlc3VsdCgnZm9v Lmh0bWwnKQogICAgICAgICBwcmludGVyLCBlcnIsIG91dCA9IHNlbGYuZ2V0X3ByaW50ZXIoWyct LXByaW50JywgJ25vdGhpbmcnXSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDZkNTU0 M2QxNGRhY2EyYTg5NmZhZjFkMWEwZmQ4OWU5ODZkMmMyOWQuLjhlMmRlMWQ3ZDI2MGQ3YmVmMWE5 OWUwNTIyZWU1OGM0YWVlODhjNjYgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtNTgs NiArNTgsNyBAQCBpbXBvcnQgUXVldWUKIGltcG9ydCByYW5kb20KIGltcG9ydCByZQogaW1wb3J0 IHNodXRpbAoraW1wb3J0IHNpZ25hbAogaW1wb3J0IHN5cwogaW1wb3J0IHRpbWUKIGltcG9ydCB0 cmFjZWJhY2sKQEAgLTY4MCw2ICs2ODEsNyBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICB0 ZXN0X3RpbWluZ3MgPSB7fQogICAgICAgICBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncyA9IFtdCiAg ICAgICAgIHRocmVhZF90aW1pbmdzID0gW10KKyAgICAgICAgaW50ZXJydXB0ZWQgPSBGYWxzZQog ICAgICAgICB0cnk6CiAgICAgICAgICAgICAjIExvb3AgdGhyb3VnaCBhbGwgdGhlIHRocmVhZHMg d2FpdGluZyBmb3IgdGhlbSB0byBmaW5pc2guCiAgICAgICAgICAgICBmb3IgdGhyZWFkIGluIHRo cmVhZHM6CkBAIC02OTcsMzAgKzY5OSwzMCBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAg ICAgICAgICAgICBzZWxmLl9kdW1wX3RocmVhZF9zdGF0ZXNfaWZfbmVjZXNzYXJ5KCkKICAgICAg ICAgICAgICAgICAgICAgc2VsZi51cGRhdGVfc3VtbWFyeShyZXN1bHRfc3VtbWFyeSkKIAotICAg ICAgICAgICAgICAgICMgVGhpcyB0aHJlYWQgaXMgZG9uZSwgc2F2ZSBvZmYgdGhlIHRpbWluZyBp bmZvcm1hdGlvbi4KLSAgICAgICAgICAgICAgICB0aHJlYWRfdGltaW5ncy5hcHBlbmQoeyduYW1l JzogdGhyZWFkLmdldE5hbWUoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICdudW1fdGVzdHMnOiB0aHJlYWQuZ2V0X251bV90ZXN0cygpLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJ3RvdGFsX3RpbWUnOiB0aHJlYWQuZ2V0X3RvdGFsX3Rp bWUoKX0pCi0gICAgICAgICAgICAgICAgdGVzdF90aW1pbmdzLnVwZGF0ZSh0aHJlYWQuZ2V0X2Rp cmVjdG9yeV90aW1pbmdfc3RhdHMoKSkKLSAgICAgICAgICAgICAgICBpbmRpdmlkdWFsX3Rlc3Rf dGltaW5ncy5leHRlbmQodGhyZWFkLmdldF90ZXN0X3Jlc3VsdHMoKSkKICAgICAgICAgZXhjZXB0 IEtleWJvYXJkSW50ZXJydXB0OgorICAgICAgICAgICAgaW50ZXJydXB0ZWQgPSBUcnVlCiAgICAg ICAgICAgICBmb3IgdGhyZWFkIGluIHRocmVhZHM6CiAgICAgICAgICAgICAgICAgdGhyZWFkLmNh bmNlbCgpCi0gICAgICAgICAgICByYWlzZQorCisgICAgICAgIGlmIG5vdCBpbnRlcnJ1cHRlZDoK KyAgICAgICAgICAgIGZvciB0aHJlYWQgaW4gdGhyZWFkczoKKyAgICAgICAgICAgICAgICAjIENo ZWNrIHdoZXRoZXIgYSB0aHJlYWQgZGllZCBiZWZvcmUgbm9ybWFsIGNvbXBsZXRpb24uCisgICAg ICAgICAgICAgICAgZXhjZXB0aW9uX2luZm8gPSB0aHJlYWQuZ2V0X2V4Y2VwdGlvbl9pbmZvKCkK KyAgICAgICAgICAgICAgICBpZiBleGNlcHRpb25faW5mbyBpcyBub3QgTm9uZToKKyAgICAgICAg ICAgICAgICAgICAgIyBSZS1yYWlzZSB0aGUgdGhyZWFkJ3MgZXhjZXB0aW9uIGhlcmUgdG8gbWFr ZSBpdCBjbGVhcgorICAgICAgICAgICAgICAgICAgICAjIHNvbWV0aGluZyB3ZW50IHdyb25nLiBP dGhlcndpc2UsIHRoZSB0ZXN0cyB0aGF0IGRpZCBub3QKKyAgICAgICAgICAgICAgICAgICAgIyBy dW4gd291bGQgYmUgYXNzdW1lZCB0byBoYXZlIHBhc3NlZC4KKyAgICAgICAgICAgICAgICAgICAg cmFpc2UgKGV4Y2VwdGlvbl9pbmZvWzBdLCBleGNlcHRpb25faW5mb1sxXSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgIGV4Y2VwdGlvbl9pbmZvWzJdKQorCiAgICAgICAgIGZvciB0aHJlYWQg aW4gdGhyZWFkczoKLSAgICAgICAgICAgICMgQ2hlY2sgd2hldGhlciBhIFRlc3RTaGVsbFRocmVh ZCBkaWVkIGJlZm9yZSBub3JtYWwgY29tcGxldGlvbi4KLSAgICAgICAgICAgIGV4Y2VwdGlvbl9p bmZvID0gdGhyZWFkLmdldF9leGNlcHRpb25faW5mbygpCi0gICAgICAgICAgICBpZiBleGNlcHRp b25faW5mbyBpcyBub3QgTm9uZToKLSAgICAgICAgICAgICAgICAjIFJlLXJhaXNlIHRoZSB0aHJl YWQncyBleGNlcHRpb24gaGVyZSB0byBtYWtlIGl0IGNsZWFyIHRoYXQKLSAgICAgICAgICAgICAg ICAjIHRlc3Rpbmcgd2FzIGFib3J0ZWQuIE90aGVyd2lzZSwgdGhlIHRlc3RzIHRoYXQgZGlkIG5v dCBydW4KLSAgICAgICAgICAgICAgICAjIHdvdWxkIGJlIGFzc3VtZWQgdG8gaGF2ZSBwYXNzZWQu Ci0gICAgICAgICAgICAgICAgcmFpc2UgZXhjZXB0aW9uX2luZm9bMF0sIGV4Y2VwdGlvbl9pbmZv WzFdLCBleGNlcHRpb25faW5mb1syXQotCi0gICAgICAgICMgRklYTUU6IFRoaXMgdXBkYXRlX3N1 bW1hcnkgY2FsbCBzZWVtcyB1bmVjZXNzYXJ5LgotICAgICAgICAjIENhbGxzIGFyZSBhbHJlYWR5 IG1hZGUgcmlnaHQgYWZ0ZXIgam9pbigpIGFib3ZlLAotICAgICAgICAjIGFzIHdlbGwgYXMgZnJv bSB0aGUgaW5kaXZpZHVhbCB0aHJlYWRzIHRoZW1zZWx2ZXMuCi0gICAgICAgIHNlbGYudXBkYXRl X3N1bW1hcnkocmVzdWx0X3N1bW1hcnkpCi0gICAgICAgIHJldHVybiAodGhyZWFkX3RpbWluZ3Ms IHRlc3RfdGltaW5ncywgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3MpCisgICAgICAgICAgICB0aHJl YWRfdGltaW5ncy5hcHBlbmQoeyduYW1lJzogdGhyZWFkLmdldE5hbWUoKSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgJ251bV90ZXN0cyc6IHRocmVhZC5nZXRfbnVtX3Rlc3Rz KCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICd0b3RhbF90aW1lJzogdGhy ZWFkLmdldF90b3RhbF90aW1lKCl9KQorICAgICAgICAgICAgdGVzdF90aW1pbmdzLnVwZGF0ZSh0 aHJlYWQuZ2V0X2RpcmVjdG9yeV90aW1pbmdfc3RhdHMoKSkKKyAgICAgICAgICAgIGluZGl2aWR1 YWxfdGVzdF90aW1pbmdzLmV4dGVuZCh0aHJlYWQuZ2V0X3Rlc3RfcmVzdWx0cygpKQorICAgICAg ICByZXR1cm4gKGludGVycnVwdGVkLCB0aHJlYWRfdGltaW5ncywgdGVzdF90aW1pbmdzLAorICAg ICAgICAgICAgICAgIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzKQogCiAgICAgZGVmIG5lZWRzX2h0 dHAoc2VsZik6CiAgICAgICAgICIiIlJldHVybnMgd2hldGhlciB0aGUgdGVzdCBydW5uZXIgbmVl ZHMgYW4gSFRUUCBzZXJ2ZXIuIiIiCkBAIC03NTIsNyArNzU0LDcgQEAgY2xhc3MgVGVzdFJ1bm5l cjoKICAgICAgICAgICAgIHNlbGYuX3BvcnQuc3RhcnRfd2Vic29ja2V0X3NlcnZlcigpCiAgICAg ICAgICAgICAjIHNlbGYuX3dlYnNvY2tldF9zZWN1cmVfc2VydmVyLlN0YXJ0KCkKIAotICAgICAg ICB0aHJlYWRfdGltaW5ncywgdGVzdF90aW1pbmdzLCBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncyA9 ICgKKyAgICAgICAgaW50ZXJydXB0ZWQsIHRocmVhZF90aW1pbmdzLCB0ZXN0X3RpbWluZ3MsIGlu ZGl2aWR1YWxfdGVzdF90aW1pbmdzID0gKAogICAgICAgICAgICAgc2VsZi5fcnVuX3Rlc3RzKHNl bGYuX3Rlc3RfZmlsZXNfbGlzdCwgcmVzdWx0X3N1bW1hcnkpKQogCiAgICAgICAgICMgV2UgZXhj bHVkZSB0aGUgY3Jhc2hlcyBmcm9tIHRoZSBsaXN0IG9mIHJlc3VsdHMgdG8gcmV0cnksIGJlY2F1 c2UKQEAgLTc2MCwxMiArNzYyLDEzIEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIGZhaWx1 cmVzID0gc2VsZi5fZ2V0X2ZhaWx1cmVzKHJlc3VsdF9zdW1tYXJ5LCBpbmNsdWRlX2NyYXNoZXM9 RmFsc2UpCiAgICAgICAgIHJldHJ5X3N1bW1hcnkgPSByZXN1bHRfc3VtbWFyeQogICAgICAgICB3 aGlsZSAobGVuKGZhaWx1cmVzKSBhbmQgc2VsZi5fb3B0aW9ucy5yZXRyeV9mYWlsdXJlcyBhbmQK LSAgICAgICAgICAgIG5vdCBzZWxmLl9yZXRyeWluZyk6CisgICAgICAgICAgICBub3Qgc2VsZi5f cmV0cnlpbmcgYW5kIG5vdCBpbnRlcnJ1cHRlZCk6CiAgICAgICAgICAgICBfbG9nLmluZm8oJycp CiAgICAgICAgICAgICBfbG9nLmluZm8oIlJldHJ5aW5nICVkIHVuZXhwZWN0ZWQgZmFpbHVyZShz KSAuLi4iICUgbGVuKGZhaWx1cmVzKSkKICAgICAgICAgICAgIF9sb2cuaW5mbygnJykKICAgICAg ICAgICAgIHNlbGYuX3JldHJ5aW5nID0gVHJ1ZQogICAgICAgICAgICAgcmV0cnlfc3VtbWFyeSA9 IFJlc3VsdFN1bW1hcnkoc2VsZi5fZXhwZWN0YXRpb25zLCBmYWlsdXJlcy5rZXlzKCkpCisgICAg ICAgICAgICAjIE5vdGUgdGhhdCB3ZSBpbnRlbnRpb25hbGx5IGlnbm9yZSB0aGUgcmV0dXJuIHZh bHVlIGhlcmUuCiAgICAgICAgICAgICBzZWxmLl9ydW5fdGVzdHMoZmFpbHVyZXMua2V5cygpLCBy ZXRyeV9zdW1tYXJ5KQogICAgICAgICAgICAgZmFpbHVyZXMgPSBzZWxmLl9nZXRfZmFpbHVyZXMo cmV0cnlfc3VtbWFyeSwgaW5jbHVkZV9jcmFzaGVzPVRydWUpCiAKQEAgLTc4Miw3ICs3ODUsOCBA QCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKIAogICAgICAg ICBzZWxmLl9wcmludGVyLnByaW50X29uZV9saW5lX3N1bW1hcnkocmVzdWx0X3N1bW1hcnkudG90 YWwsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHRf c3VtbWFyeS5leHBlY3RlZCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJlc3VsdF9zdW1tYXJ5LmV4cGVjdGVkLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZCkKIAogICAgICAg ICB1bmV4cGVjdGVkX3Jlc3VsdHMgPSBzdW1tYXJpemVfdW5leHBlY3RlZF9yZXN1bHRzKHNlbGYu X3BvcnQsCiAgICAgICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMsIHJlc3VsdF9zdW1tYXJ5LCBy ZXRyeV9zdW1tYXJ5KQpAQCAtODAwLDYgKzgwNCwxMSBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAg ICAgICBpZiBzZWxmLl9vcHRpb25zLnNob3dfcmVzdWx0cyBhbmQgd3JvdGVfcmVzdWx0czoKICAg ICAgICAgICAgIHNlbGYuX3Nob3dfcmVzdWx0c19odG1sX2ZpbGUoKQogCisgICAgICAgICMgTm93 IHRoYXQgd2UndmUgY29tcGxldGVkIGFsbCB0aGUgcHJvY2Vzc2luZyB3ZSBjYW4sIHdlIHJlLXJh aXNlCisgICAgICAgICMgYSBLZXlib2FyZEludGVycnVwdCBpZiBuZWNlc3Nhcnkgc28gdGhlIGNh bGxlciBjYW4gaGFuZGxlIGl0LgorICAgICAgICBpZiBpbnRlcnJ1cHRlZDoKKyAgICAgICAgICAg IHJhaXNlIEtleWJvYXJkSW50ZXJydXB0CisKICAgICAgICAgIyBJZ25vcmUgZmxha3kgZmFpbHVy ZXMgYW5kIHVuZXhwZWN0ZWQgcGFzc2VzIHNvIHdlIGRvbid0IHR1cm4gdGhlCiAgICAgICAgICMg Ym90IHJlZCBmb3IgdGhvc2UuCiAgICAgICAgIHJldHVybiB1bmV4cGVjdGVkX3Jlc3VsdHNbJ251 bV9yZWdyZXNzaW9ucyddCkBAIC0xNjY1LDQgKzE2NzQsOCBAQCBkZWYgbWFpbigpOgogICAgIHJl dHVybiBydW4ocG9ydF9vYmosIG9wdGlvbnMsIGFyZ3MpCiAKIGlmICdfX21haW5fXycgPT0gX19u YW1lX186Ci0gICAgc3lzLmV4aXQobWFpbigpKQorICAgIHRyeToKKyAgICAgICAgc3lzLmV4aXQo bWFpbigpKQorICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKKyAgICAgICAgIyB0aGlzIG1p cnJvcnMgd2hhdCB0aGUgc2hlbGwgbm9ybWFsbHkgZG9lcworICAgICAgICBzeXMuZXhpdChzaWdu YWwuU0lHSU5UICsgMTI4KQo=