50045 2010-11-24 16:43:49 -0800 new-run-webkit-tests: add a --dry-run / -n flag 2010-12-01 15:59:33 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 313526 0 dpranke 2010-11-24 16:43:49 -0800 new-run-webkit-tests: add a --dry-run / -n flag 313528 1 74811 dpranke 2010-11-24 16:50:11 -0800 Created attachment 74811 Patch 313543 2 74811 tony 2010-11-24 17:08:05 -0800 Comment on attachment 74811 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=74811&action=review > WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:612 > try: > - message_broker.run_message_loop() > + if not self._options.dry_run: > + message_broker.run_message_loop() I would put the 'if' outside try/except since the try/except doesn't seem to apply if it's a dry run. 313553 3 74817 dpranke 2010-11-24 17:35:13 -0800 Created attachment 74817 review feedback, fix default value for --dry-run 313554 4 dpranke 2010-11-24 17:37:00 -0800 (In reply to comment #2) > (From update of attachment 74811 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=74811&action=review > > > WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py:612 > > try: > > - message_broker.run_message_loop() > > + if not self._options.dry_run: > > + message_broker.run_message_loop() > > I would put the 'if' outside try/except since the try/except doesn't seem to apply if it's a dry run. Done. I was attempting to follow the "skip as little code as possible" rule with --dry-run, which sort of conflicts with the "wrap as little code as possible in the try block" rule. I think the precedence here is a bit of a toss-up, but I've done it your way. Also, fixed the default value for --dry-run which was causing all of the tests I didn't add to fail ;) 315922 5 74817 dpranke 2010-12-01 15:59:28 -0800 Comment on attachment 74817 review feedback, fix default value for --dry-run Clearing flags on attachment: 74817 Committed r73080: <http://trac.webkit.org/changeset/73080> 315923 6 dpranke 2010-12-01 15:59:33 -0800 All reviewed patches have been landed. Closing bug. 74811 2010-11-24 16:50:11 -0800 2010-11-24 17:35:10 -0800 Patch bug-50045-20101124165009.patch text/plain 4675 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3YTg5ZjMzYzk5MDY3ZDJmZmQ4MWZjNDhlMjU5ODg2NjAxYmIzYWQwLi41NjUyNDI1 YWI5MTQ4NjNlZjhkNWI1OTFiNDBhMjJkMjA3NjlmMzc0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAK IDIwMTAtMTEtMjQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQt dGVzdHM6IGFkZCBhIC0tZHJ5LXJ1biAvIC1uIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMDQ1CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHk6CisKKzIw MTAtMTEtMjQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAg UmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KIAogICAgICAgICBUaGlzIHBhdGNoIGltcGxlbWVudHMg dGhlIGZpcnN0IHBhcnQgb2YgdGhlIG1hbmFnZXIgc2lkZSBvZiB0aGUKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMu cHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5CmluZGV4IGQ3OGU0NTI5OWZkNGVkMmYxM2MxNWM0ZWUwOWMzYWUyMzRkNzM5ZmUu LmQ1YjViMjcwZWJjNmMyYmVmMTRlYjg1ZDRjMDE5MjVlZDRiMWY4ZjQgMTAwNzU1Ci0tLSBhL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dl YmtpdF90ZXN0cy5weQpAQCAtNTk5LDEyICs1OTksMTcgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAg ICAgICAgbWVzc2FnZV9icm9rZXIgPSBzZWxmLl9tZXNzYWdlX2Jyb2tlcgogICAgICAgICBzZWxm Ll9jdXJyZW50X2ZpbGVuYW1lX3F1ZXVlID0gZmlsZW5hbWVfcXVldWUKICAgICAgICAgc2VsZi5f Y3VycmVudF9yZXN1bHRfc3VtbWFyeSA9IHJlc3VsdF9zdW1tYXJ5Ci0gICAgICAgIHRocmVhZHMg PSBtZXNzYWdlX2Jyb2tlci5zdGFydF93b3JrZXJzKHNlbGYpCisKKyAgICAgICAgaWYgbm90IHNl bGYuX29wdGlvbnMuZHJ5X3J1bjoKKyAgICAgICAgICAgIHRocmVhZHMgPSBtZXNzYWdlX2Jyb2tl ci5zdGFydF93b3JrZXJzKHNlbGYpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICB0aHJlYWRz ID0ge30KIAogICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X3VwZGF0ZSgiU3RhcnRpbmcgdGVz dGluZyAuLi4iKQogICAgICAgICBrZXlib2FyZF9pbnRlcnJ1cHRlZCA9IEZhbHNlCiAgICAgICAg IHRyeToKLSAgICAgICAgICAgIG1lc3NhZ2VfYnJva2VyLnJ1bl9tZXNzYWdlX2xvb3AoKQorICAg ICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuZHJ5X3J1bjoKKyAgICAgICAgICAgICAgICBt ZXNzYWdlX2Jyb2tlci5ydW5fbWVzc2FnZV9sb29wKCkKICAgICAgICAgZXhjZXB0IEtleWJvYXJk SW50ZXJydXB0OgogICAgICAgICAgICAgX2xvZy5pbmZvKCJJbnRlcnJ1cHRlZCwgZXhpdGluZyIp CiAgICAgICAgICAgICBtZXNzYWdlX2Jyb2tlci5jYW5jZWxfd29ya2VycygpCkBAIC03MzcsMTYg Kzc0MiwxOCBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRp b25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlfc3VtbWFyeSkKICAgICAgICAgc2VsZi5fcHJpbnRl ci5wcmludF91bmV4cGVjdGVkX3Jlc3VsdHModW5leHBlY3RlZF9yZXN1bHRzKQogCi0gICAgICAg IGlmIHNlbGYuX29wdGlvbnMucmVjb3JkX3Jlc3VsdHM6CisgICAgICAgIGlmIChzZWxmLl9vcHRp b25zLnJlY29yZF9yZXN1bHRzIGFuZCBub3Qgc2VsZi5fb3B0aW9ucy5kcnlfcnVuIGFuZAorICAg ICAgICAgICAgbm90IGtleWJvYXJkX2ludGVycnVwdGVkKToKICAgICAgICAgICAgICMgV3JpdGUg dGhlIHNhbWUgZGF0YSB0byBsb2cgZmlsZXMgYW5kIHVwbG9hZCBnZW5lcmF0ZWQgSlNPTiBmaWxl cwogICAgICAgICAgICAgIyB0byBhcHBlbmdpbmUgc2VydmVyLgogICAgICAgICAgICAgc2VsZi5f dXBsb2FkX2pzb25fZmlsZXModW5leHBlY3RlZF9yZXN1bHRzLCByZXN1bHRfc3VtbWFyeSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluZGl2aWR1YWxfdGVzdF90aW1pbmdz KQogCiAgICAgICAgICMgV3JpdGUgdGhlIHN1bW1hcnkgdG8gZGlzayAocmVzdWx0cy5odG1sKSBh bmQgZGlzcGxheSBpdCBpZiByZXF1ZXN0ZWQuCi0gICAgICAgIHdyb3RlX3Jlc3VsdHMgPSBzZWxm Ll93cml0ZV9yZXN1bHRzX2h0bWxfZmlsZShyZXN1bHRfc3VtbWFyeSkKLSAgICAgICAgaWYgc2Vs Zi5fb3B0aW9ucy5zaG93X3Jlc3VsdHMgYW5kIHdyb3RlX3Jlc3VsdHM6Ci0gICAgICAgICAgICBz ZWxmLl9zaG93X3Jlc3VsdHNfaHRtbF9maWxlKCkKKyAgICAgICAgaWYgbm90IHNlbGYuX29wdGlv bnMuZHJ5X3J1bjoKKyAgICAgICAgICAgIHdyb3RlX3Jlc3VsdHMgPSBzZWxmLl93cml0ZV9yZXN1 bHRzX2h0bWxfZmlsZShyZXN1bHRfc3VtbWFyeSkKKyAgICAgICAgICAgIGlmIHNlbGYuX29wdGlv bnMuc2hvd19yZXN1bHRzIGFuZCB3cm90ZV9yZXN1bHRzOgorICAgICAgICAgICAgICAgIHNlbGYu X3Nob3dfcmVzdWx0c19odG1sX2ZpbGUoKQogCiAgICAgICAgICMgTm93IHRoYXQgd2UndmUgY29t cGxldGVkIGFsbCB0aGUgcHJvY2Vzc2luZyB3ZSBjYW4sIHdlIHJlLXJhaXNlCiAgICAgICAgICMg YSBLZXlib2FyZEludGVycnVwdCBpZiBuZWNlc3Nhcnkgc28gdGhlIGNhbGxlciBjYW4gaGFuZGxl IGl0LgpAQCAtMTUxOCw2ICsxNTI1LDkgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25lKToKICAg ICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbm8tYnVpbGQiLCBkZXN0PSJidWlsZCIsCiAg ICAgICAgICAgICBhY3Rpb249InN0b3JlX2ZhbHNlIiwgaGVscD0iRG9uJ3QgY2hlY2sgdG8gc2Vl IGlmIHRoZSAiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiRHVtcFJl bmRlclRyZWUgYnVpbGQgaXMgdXAtdG8tZGF0ZS4iKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9v cHRpb24oIi1uIiwgIi0tZHJ5LXJ1biIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCisgICAgICAgICAg ICBkZWZhdWx0PSJmYWxzZSIsCisgICAgICAgICAgICBoZWxwPSJEbyBldmVyeXRoaW5nIGJ1dCBh Y3R1YWxseSBydW4gdGhlIHRlc3RzIG9yIHVwbG9hZCByZXN1bHRzLiIpLAogICAgICAgICAjIG9s ZC1ydW4td2Via2l0LXRlc3RzIGhhcyAtLXZhbGdyaW5kIGluc3RlYWQgb2Ygd3JhcHBlci4KICAg ICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0td3JhcHBlciIsCiAgICAgICAgICAgICBoZWxw PSJ3cmFwcGVyIGNvbW1hbmQgdG8gaW5zZXJ0IGJlZm9yZSBpbnZvY2F0aW9ucyBvZiAiCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQppbmRleCBiM2M4ODYxMDNjOGFi NzE1YjM3Njk1YmRiNjUwNjFmOWRhOWQ2ZDQ4Li4zMjc4ZGFjZDkwZmY3NDEwZGRlMjQ0NDYwMDI5 YzgzZGY2MjEwNmNiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3Qu cHkKQEAgLTIwMSw2ICsyMDEsMTMgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICBzZWxmLmFzc2VydFRydWUoJ1J1bm5pbmcgMiBEdW1wUmVuZGVyVHJlZXMgaW4g cGFyYWxsZWxcbicKICAgICAgICAgICAgICAgICAgICAgICAgIGluIHJlZ3VsYXJfb3V0cHV0Lmdl dCgpKQogCisgICAgZGVmIHRlc3RfZHJ5cnVuKHNlbGYpOgorICAgICAgICBiYXRjaF90ZXN0c19y dW4gPSBnZXRfdGVzdHNfcnVuKFsnLS1kcnktcnVuJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoYmF0Y2hfdGVzdHNfcnVuLCBbXSkKKworICAgICAgICBiYXRjaF90ZXN0c19ydW4gPSBnZXRf dGVzdHNfcnVuKFsnLW4nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChiYXRjaF90ZXN0c19y dW4sIFtdKQorCiAgICAgZGVmIHRlc3RfZXhjZXB0aW9uX3JhaXNlZChzZWxmKToKICAgICAgICAg c2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJvciwgbG9nZ2luZ19ydW4sCiAgICAgICAgICAgICBb J2ZhaWx1cmVzL2V4cGVjdGVkL2V4Y2VwdGlvbi5odG1sJ10sIHRlc3RzX2luY2x1ZGVkPVRydWUp Cg== 74817 2010-11-24 17:35:13 -0800 2010-12-01 15:59:28 -0800 review feedback, fix default value for --dry-run bug-50045-20101124173512.patch text/plain 5351 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxYWMyNGQwMjcwMDM1MGY2OGI2ZTNmZjk1MTJkMTQ5YjFiOWEzNjQ4Li40YTdkYTk0 YmFjOTE2Y2Q0MGMzNjU2OWJmZDAxYjg5YjRjODQyNGY2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUgQEAK IDIwMTAtMTEtMjQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQt dGVzdHM6IGFkZCBhIC0tZHJ5LXJ1biAvIC1uIGZsYWcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMDQ1CisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHk6CisKKzIw MTAtMTEtMjQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAg UmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KIAogICAgICAgICBucnd0IC0gY2xlYW4gdXAgY3JlYXRl X2RyaXZlciBpbnRlcmZhY2UgYW5kIHByaW50IG91dCB0aGUKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz LnB5CmluZGV4IDY0M2UyMDQ5M2M4YTNiZjQwYWIwOGVmNDRiOWRlNzA5MTFiNDNlNzkuLmY0ZTky YTY4Njk4ZDRiMDY5MDMxZDZiYjFiMzc4ODJkYmFmMWZhZjUgMTAwNzU1Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysr IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90 ZXN0cy5weQpAQCAtNTk5LDIwICs1OTksMjUgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAg bWVzc2FnZV9icm9rZXIgPSBzZWxmLl9tZXNzYWdlX2Jyb2tlcgogICAgICAgICBzZWxmLl9jdXJy ZW50X2ZpbGVuYW1lX3F1ZXVlID0gZmlsZW5hbWVfcXVldWUKICAgICAgICAgc2VsZi5fY3VycmVu dF9yZXN1bHRfc3VtbWFyeSA9IHJlc3VsdF9zdW1tYXJ5Ci0gICAgICAgIHRocmVhZHMgPSBtZXNz YWdlX2Jyb2tlci5zdGFydF93b3JrZXJzKHNlbGYpCisKKyAgICAgICAgaWYgbm90IHNlbGYuX29w dGlvbnMuZHJ5X3J1bjoKKyAgICAgICAgICAgIHRocmVhZHMgPSBtZXNzYWdlX2Jyb2tlci5zdGFy dF93b3JrZXJzKHNlbGYpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICB0aHJlYWRzID0ge30K IAogICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X3VwZGF0ZSgiU3RhcnRpbmcgdGVzdGluZyAu Li4iKQogICAgICAgICBrZXlib2FyZF9pbnRlcnJ1cHRlZCA9IEZhbHNlCi0gICAgICAgIHRyeToK LSAgICAgICAgICAgIG1lc3NhZ2VfYnJva2VyLnJ1bl9tZXNzYWdlX2xvb3AoKQotICAgICAgICBl eGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6Ci0gICAgICAgICAgICBfbG9nLmluZm8oIkludGVycnVw dGVkLCBleGl0aW5nIikKLSAgICAgICAgICAgIG1lc3NhZ2VfYnJva2VyLmNhbmNlbF93b3JrZXJz KCkKLSAgICAgICAgICAgIGtleWJvYXJkX2ludGVycnVwdGVkID0gVHJ1ZQotICAgICAgICBleGNl cHQ6Ci0gICAgICAgICAgICAjIFVuZXhwZWN0ZWQgZXhjZXB0aW9uOyBkb24ndCB0cnkgdG8gY2xl YW4gdXAgd29ya2Vycy4KLSAgICAgICAgICAgIF9sb2cuaW5mbygiRXhjZXB0aW9uIHJhaXNlZCwg ZXhpdGluZyIpCi0gICAgICAgICAgICByYWlzZQorICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9u cy5kcnlfcnVuOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIG1lc3NhZ2VfYnJv a2VyLnJ1bl9tZXNzYWdlX2xvb3AoKQorICAgICAgICAgICAgZXhjZXB0IEtleWJvYXJkSW50ZXJy dXB0OgorICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiSW50ZXJydXB0ZWQsIGV4aXRpbmciKQor ICAgICAgICAgICAgICAgIG1lc3NhZ2VfYnJva2VyLmNhbmNlbF93b3JrZXJzKCkKKyAgICAgICAg ICAgICAgICBrZXlib2FyZF9pbnRlcnJ1cHRlZCA9IFRydWUKKyAgICAgICAgICAgIGV4Y2VwdDoK KyAgICAgICAgICAgICAgICAjIFVuZXhwZWN0ZWQgZXhjZXB0aW9uOyBkb24ndCB0cnkgdG8gY2xl YW4gdXAgd29ya2Vycy4KKyAgICAgICAgICAgICAgICBfbG9nLmluZm8oIkV4Y2VwdGlvbiByYWlz ZWQsIGV4aXRpbmciKQorICAgICAgICAgICAgICAgIHJhaXNlCiAKICAgICAgICAgdGhyZWFkX3Rp bWluZ3MsIHRlc3RfdGltaW5ncywgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3MgPSBcCiAgICAgICAg ICAgICBzZWxmLl9jb2xsZWN0X3RpbWluZ19pbmZvKHRocmVhZHMpCkBAIC03MzcsMTYgKzc0Miwx OCBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zLCBy ZXN1bHRfc3VtbWFyeSwgcmV0cnlfc3VtbWFyeSkKICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF91bmV4cGVjdGVkX3Jlc3VsdHModW5leHBlY3RlZF9yZXN1bHRzKQogCi0gICAgICAgIGlmIHNl bGYuX29wdGlvbnMucmVjb3JkX3Jlc3VsdHM6CisgICAgICAgIGlmIChzZWxmLl9vcHRpb25zLnJl Y29yZF9yZXN1bHRzIGFuZCBub3Qgc2VsZi5fb3B0aW9ucy5kcnlfcnVuIGFuZAorICAgICAgICAg ICAgbm90IGtleWJvYXJkX2ludGVycnVwdGVkKToKICAgICAgICAgICAgICMgV3JpdGUgdGhlIHNh bWUgZGF0YSB0byBsb2cgZmlsZXMgYW5kIHVwbG9hZCBnZW5lcmF0ZWQgSlNPTiBmaWxlcwogICAg ICAgICAgICAgIyB0byBhcHBlbmdpbmUgc2VydmVyLgogICAgICAgICAgICAgc2VsZi5fdXBsb2Fk X2pzb25fZmlsZXModW5leHBlY3RlZF9yZXN1bHRzLCByZXN1bHRfc3VtbWFyeSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzKQogCiAg ICAgICAgICMgV3JpdGUgdGhlIHN1bW1hcnkgdG8gZGlzayAocmVzdWx0cy5odG1sKSBhbmQgZGlz cGxheSBpdCBpZiByZXF1ZXN0ZWQuCi0gICAgICAgIHdyb3RlX3Jlc3VsdHMgPSBzZWxmLl93cml0 ZV9yZXN1bHRzX2h0bWxfZmlsZShyZXN1bHRfc3VtbWFyeSkKLSAgICAgICAgaWYgc2VsZi5fb3B0 aW9ucy5zaG93X3Jlc3VsdHMgYW5kIHdyb3RlX3Jlc3VsdHM6Ci0gICAgICAgICAgICBzZWxmLl9z aG93X3Jlc3VsdHNfaHRtbF9maWxlKCkKKyAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuZHJ5 X3J1bjoKKyAgICAgICAgICAgIHdyb3RlX3Jlc3VsdHMgPSBzZWxmLl93cml0ZV9yZXN1bHRzX2h0 bWxfZmlsZShyZXN1bHRfc3VtbWFyeSkKKyAgICAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuc2hv d19yZXN1bHRzIGFuZCB3cm90ZV9yZXN1bHRzOgorICAgICAgICAgICAgICAgIHNlbGYuX3Nob3df cmVzdWx0c19odG1sX2ZpbGUoKQogCiAgICAgICAgICMgTm93IHRoYXQgd2UndmUgY29tcGxldGVk IGFsbCB0aGUgcHJvY2Vzc2luZyB3ZSBjYW4sIHdlIHJlLXJhaXNlCiAgICAgICAgICMgYSBLZXli b2FyZEludGVycnVwdCBpZiBuZWNlc3Nhcnkgc28gdGhlIGNhbGxlciBjYW4gaGFuZGxlIGl0LgpA QCAtMTUyMCw2ICsxNTI3LDkgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25lKToKICAgICAgICAg b3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbm8tYnVpbGQiLCBkZXN0PSJidWlsZCIsCiAgICAgICAg ICAgICBhY3Rpb249InN0b3JlX2ZhbHNlIiwgaGVscD0iRG9uJ3QgY2hlY2sgdG8gc2VlIGlmIHRo ZSAiCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiRHVtcFJlbmRlclRy ZWUgYnVpbGQgaXMgdXAtdG8tZGF0ZS4iKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24o Ii1uIiwgIi0tZHJ5LXJ1biIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCisgICAgICAgICAgICBkZWZh dWx0PUZhbHNlLAorICAgICAgICAgICAgaGVscD0iRG8gZXZlcnl0aGluZyBidXQgYWN0dWFsbHkg cnVuIHRoZSB0ZXN0cyBvciB1cGxvYWQgcmVzdWx0cy4iKSwKICAgICAgICAgIyBvbGQtcnVuLXdl YmtpdC10ZXN0cyBoYXMgLS12YWxncmluZCBpbnN0ZWFkIG9mIHdyYXBwZXIuCiAgICAgICAgIG9w dHBhcnNlLm1ha2Vfb3B0aW9uKCItLXdyYXBwZXIiLAogICAgICAgICAgICAgaGVscD0id3JhcHBl ciBjb21tYW5kIHRvIGluc2VydCBiZWZvcmUgaW52b2NhdGlvbnMgb2YgIgpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 c191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKaW5kZXggMjBhNGFjMGVhZGE3OTU2NTA1OTlm OTEwMGIxYTMwZjEzZmVhNjI3MC4uNmJiNzQxYTU3YzkxYzBiMGUyNjRjZmRlN2Q2NDEwY2JmNTgz OTY2YSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CkBAIC0y MDEsNiArMjAxLDEzIEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKCdSdW5uaW5nIDIgRHVtcFJlbmRlclRyZWVzIGluIHBhcmFsbGVs XG4nCiAgICAgICAgICAgICAgICAgICAgICAgICBpbiByZWd1bGFyX291dHB1dC5nZXQoKSkKIAor ICAgIGRlZiB0ZXN0X2RyeXJ1bihzZWxmKToKKyAgICAgICAgYmF0Y2hfdGVzdHNfcnVuID0gZ2V0 X3Rlc3RzX3J1bihbJy0tZHJ5LXJ1biddKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGJhdGNo X3Rlc3RzX3J1biwgW10pCisKKyAgICAgICAgYmF0Y2hfdGVzdHNfcnVuID0gZ2V0X3Rlc3RzX3J1 bihbJy1uJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYmF0Y2hfdGVzdHNfcnVuLCBbXSkK KwogICAgIGRlZiB0ZXN0X2V4Y2VwdGlvbl9yYWlzZWQoc2VsZik6CiAgICAgICAgIHNlbGYuYXNz ZXJ0UmFpc2VzKFZhbHVlRXJyb3IsIGxvZ2dpbmdfcnVuLAogICAgICAgICAgICAgWydmYWlsdXJl cy9leHBlY3RlZC9leGNlcHRpb24uaHRtbCddLCB0ZXN0c19pbmNsdWRlZD1UcnVlKQo=