38553 2010-05-04 16:17:18 -0700 new-run-webkit-tests: disable threading on macs by default 2010-05-04 18:44:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dpranke dpranke cjerdonek dglazkov eric ojan tony oldest_to_newest 220856 0 dpranke 2010-05-04 16:17:18 -0700 We are currently trying to diagnose what appear to be several concurrency-related hangs on the Chromium bots. Several bots (Chromium WebKit Mac (webkit.org) canary, Chromium WebKit Mac, Chromium WebKit Mac (dbg)(3) ) seem to be hanging more than 25% of the time. Until we can diagnose what's going on better, we should consider disabling concurrency by default on the Chromium Mac ports. Most of the bots run two threads in parallel, so this will near-double the cycle time for the layout tests on them. 220858 1 eric 2010-05-04 16:19:32 -0700 Another possibility would be to try changing DEPS to point to an older version of WebKitTools on those bots and see if the hangs go away. 220860 2 55069 dpranke 2010-05-04 16:25:18 -0700 Created attachment 55069 patch 220861 3 55069 eric 2010-05-04 16:27:39 -0700 Comment on attachment 55069 patch We really should have a unit test for the run_webkit_tests.py change. This seems OK or now. Unfortunately it means we'll stop getting crash/hang data, but hopefully we have enough and can repro locally anyway. Seems we should log to the console when we do this override. 220867 4 55069 eric 2010-05-04 16:36:50 -0700 Comment on attachment 55069 patch Please fix the mentioned nits. If you aren't going to unit test this we should at least mention why in the ChangeLog. 220870 5 55070 dpranke 2010-05-04 16:44:17 -0700 Created attachment 55070 add log message 220884 6 55075 dpranke 2010-05-04 17:07:34 -0700 Created attachment 55075 add unit tests for the change to run_webkit_tests 220891 7 dpranke 2010-05-04 17:17:06 -0700 Committed r58789: <http://trac.webkit.org/changeset/58789> 220931 8 eric 2010-05-04 18:44:43 -0700 Thanks for the tests! 55069 2010-05-04 16:25:18 -0700 2010-05-04 16:44:17 -0700 patch wk38553_disable_threading.diff text/plain 2245 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhYzYzM2JmLi42NGI2Zjc4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDUt MDQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQtdGVzdHM6IHR1 cm4gb2ZmIHRocmVhZGluZyBvbiB0aGUgQ2hyb21pdW0gTWFjIHBvcnQgdW50aWwKKyAgICAgICAg d2UgY2FuIHN0YWJpbGl6ZSB0aGUgcG9ydCBtb3JlIGFuZCBmaWd1cmUgb3V0IHdoeSBpdCBpcyBo YW5naW5nIHNvCisgICAgICAgIGZyZXF1ZW50bHkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NTUzCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorCiAyMDEwLTA1LTA0 ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5 IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9tYWMucHkKaW5kZXggMGQxZDI3Yi4uNDRhMWY4NSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9t YWMucHkKQEAgLTY3LDYgKzY3LDExIEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5D aHJvbWl1bVBvcnQpOgogICAgICAgICAgICAgICAgICAgICAgICAnTWFjQnVpbGRJbnN0cnVjdGlv bnMnKQogICAgICAgICByZXR1cm4gcmVzdWx0CiAKKyAgICBkZWYgZGVmYXVsdF9jaGlsZF9wcm9j ZXNzZXMoc2VsZik6CisgICAgICAgICMgRklYTUU6IHdlIG5lZWQgdG8gcnVuIHNpbmdsZS10aHJl YWRlZCBmb3Igbm93LiBTZWUKKyAgICAgICAgIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mzg1NTMKKyAgICAgICAgcmV0dXJuIDEKKwogICAgIGRlZiBkcml2ZXJfbmFt ZShzZWxmKToKICAgICAgICAgIiIibmFtZSBmb3IgdGhpcyBwb3J0J3MgZXF1aXZhbGVudCBvZiBE dW1wUmVuZGVyVHJlZS4iIiIKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy51c2VfZHJ0OgpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dl YmtpdF90ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggNDkwYjBmYy4uZjVkNTEzZiAxMDA3NTUKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 cy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzLnB5CkBAIC0xMzE2LDcgKzEzMTYsNyBAQCBkZWYgcnVuKHBvcnRfb2JqLCBv cHRpb25zLCBhcmdzKToKICAgICAgICAgICAgICAgICAgICAob3B0aW9ucy50aW1lX291dF9tcywg b3B0aW9ucy5zbG93X3RpbWVfb3V0X21zKSkKIAogICAgIGlmIGludChvcHRpb25zLmNoaWxkX3By b2Nlc3NlcykgPT0gMToKLSAgICAgICAgcHJpbnRlci5wcmludF9jb25maWcoIlJ1bm5pbmcgb25l ICVzIiAlIHBvcnRfb2JqLmRyaXZlcl9uYW1lKQorICAgICAgICBwcmludGVyLnByaW50X2NvbmZp ZygiUnVubmluZyBvbmUgJXMiICUgcG9ydF9vYmouZHJpdmVyX25hbWUoKSkKICAgICBlbHNlOgog ICAgICAgICBwcmludGVyLnByaW50X2NvbmZpZygiUnVubmluZyAlcyAlc3MgaW4gcGFyYWxsZWwi ICUgKAogICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25zLmNoaWxkX3Byb2Nlc3NlcywgcG9y dF9vYmouZHJpdmVyX25hbWUoKSkpCg== 55070 2010-05-04 16:44:17 -0700 2010-05-04 17:07:34 -0700 add log message wk38553_disable_threading.diff text/plain 2524 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhYzYzM2JmLi42NGI2Zjc4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDUt MDQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQtdGVzdHM6IHR1 cm4gb2ZmIHRocmVhZGluZyBvbiB0aGUgQ2hyb21pdW0gTWFjIHBvcnQgdW50aWwKKyAgICAgICAg d2UgY2FuIHN0YWJpbGl6ZSB0aGUgcG9ydCBtb3JlIGFuZCBmaWd1cmUgb3V0IHdoeSBpdCBpcyBo YW5naW5nIHNvCisgICAgICAgIGZyZXF1ZW50bHkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NTUzCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorCiAyMDEwLTA1LTA0 ICBMYXN6bG8gR29tYm9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5 IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9tYWMucHkKaW5kZXggMGQxZDI3Yi4uNGVhZDI2ZiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9t YWMucHkKQEAgLTY3LDYgKzY3LDE1IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5D aHJvbWl1bVBvcnQpOgogICAgICAgICAgICAgICAgICAgICAgICAnTWFjQnVpbGRJbnN0cnVjdGlv bnMnKQogICAgICAgICByZXR1cm4gcmVzdWx0CiAKKyAgICBkZWYgZGVmYXVsdF9jaGlsZF9wcm9j ZXNzZXMoc2VsZik6CisgICAgICAgICMgRklYTUU6IHdlIG5lZWQgdG8gcnVuIHNpbmdsZS10aHJl YWRlZCBmb3Igbm93LiBTZWUKKyAgICAgICAgIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Mzg1NTMuIFVuZm9ydHVuYXRlbHkgdGhpcworICAgICAgICAjIHJvdXRpbmUg aXMgY2FsbGVkIHJpZ2h0IGJlZm9yZSB0aGUgbG9nZ2VyIGlzIGNvbmZpZ3VyZWQsIHNvIGlmIHdl CisgICAgICAgICMgdHJ5IHRvIF9sb2cud2FybmluZygpLCBpdCBnZXRzIHRocm93biBhd2F5Lgor ICAgICAgICBpbXBvcnQgc3lzCisgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkRlZmF1bHRpbmcg dG8gb25lIGNoaWxkIC0gc2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zODU1M1xuIikKKyAgICAgICAgcmV0dXJuIDEKKwogICAgIGRlZiBkcml2ZXJfbmFtZShzZWxm KToKICAgICAgICAgIiIibmFtZSBmb3IgdGhpcyBwb3J0J3MgZXF1aXZhbGVudCBvZiBEdW1wUmVu ZGVyVHJlZS4iIiIKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy51c2VfZHJ0OgpkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90 ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkKaW5kZXggNDkwYjBmYy4uZjVkNTEzZiAxMDA3NTUKLS0tIGEvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQor KysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5CkBAIC0xMzE2LDcgKzEzMTYsNyBAQCBkZWYgcnVuKHBvcnRfb2JqLCBvcHRpb25z LCBhcmdzKToKICAgICAgICAgICAgICAgICAgICAob3B0aW9ucy50aW1lX291dF9tcywgb3B0aW9u cy5zbG93X3RpbWVfb3V0X21zKSkKIAogICAgIGlmIGludChvcHRpb25zLmNoaWxkX3Byb2Nlc3Nl cykgPT0gMToKLSAgICAgICAgcHJpbnRlci5wcmludF9jb25maWcoIlJ1bm5pbmcgb25lICVzIiAl IHBvcnRfb2JqLmRyaXZlcl9uYW1lKQorICAgICAgICBwcmludGVyLnByaW50X2NvbmZpZygiUnVu bmluZyBvbmUgJXMiICUgcG9ydF9vYmouZHJpdmVyX25hbWUoKSkKICAgICBlbHNlOgogICAgICAg ICBwcmludGVyLnByaW50X2NvbmZpZygiUnVubmluZyAlcyAlc3MgaW4gcGFyYWxsZWwiICUgKAog ICAgICAgICAgICAgICAgICAgICAgICBvcHRpb25zLmNoaWxkX3Byb2Nlc3NlcywgcG9ydF9vYmou ZHJpdmVyX25hbWUoKSkpCg== 55075 2010-05-04 17:07:34 -0700 2010-05-04 17:07:34 -0700 add unit tests for the change to run_webkit_tests wk38553_disable_threading.diff text/plain 7021 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhYzYzM2JmLi40OTdjNjc4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMDUt MDQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbmV3LXJ1bi13ZWJraXQtdGVzdHM6IHR1 cm4gb2ZmIHRocmVhZGluZyBvbiB0aGUgQ2hyb21pdW0gTWFjIHBvcnQgdW50aWwKKyAgICAgICAg d2UgY2FuIHN0YWJpbGl6ZSB0aGUgcG9ydCBtb3JlIGFuZCBmaWd1cmUgb3V0IHdoeSBpdCBpcyBo YW5naW5nIHNvCisgICAgICAgIGZyZXF1ZW50bHkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NTUzCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weToKKyAgICAgICAgICAtIG92ZXJy aWRlIGRlZmF1bHRfY2hpbGRfcHJvY2Vzc2VzKCkgYW5kIGxvZyBhIHdhcm5pbmcKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAg ICAgICAgIC0gZml4IGEgdHlwbyB0aGF0IGNhdXNlZCB1cyB0byBwcmludCBhIG1ldGhvZCBvYmpl Y3QgaW5zdGVhZCBvZiB0aGUKKyAgICAgICAgICAgIHZhbHVlIHRoZSBtZXRob2Qgb2JqZWN0IHJl dHVybnMgaW4gdGhlIGNhc2Ugd2hlcmUgdGhlcmUgaXMgb25seQorICAgICAgICAgICAgb25lIGNo aWxkIHByb2Nlc3MuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0c191bml0dGVzdC5weToKKyAgICAgICAgICAtIEFkZCB1bml0IHRlc3RzIGZv ciB0aGUgb3V0cHV0IG9mIHJ1bl93ZWJraXRfdGVzdHMgLSBpbiB0aGlzIGNhc2UsCisgICAgICAg ICAgICB0aGUgaGFuZGxpbmcgb2YgLS1jaGlsZC1wcm9jZXNzZXMgYW5kIC0tcHJpbnQgY29uZmln CisKIDIwMTAtMDUtMDQgIExhc3psbyBHb21ib3MgIDxsYXN6bG8uMS5nb21ib3NAbm9raWEuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9tYWMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX21hYy5weQppbmRleCAwZDFkMjdiLi40ZWFkMjZmIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVt X21hYy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX21hYy5weQpAQCAtNjcsNiArNjcsMTUgQEAgY2xhc3MgQ2hyb21pdW1NYWNQ b3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgICAgICAgICAgICAgICAgICAgICdNYWNC dWlsZEluc3RydWN0aW9ucycpCiAgICAgICAgIHJldHVybiByZXN1bHQKIAorICAgIGRlZiBkZWZh dWx0X2NoaWxkX3Byb2Nlc3NlcyhzZWxmKToKKyAgICAgICAgIyBGSVhNRTogd2UgbmVlZCB0byBy dW4gc2luZ2xlLXRocmVhZGVkIGZvciBub3cuIFNlZQorICAgICAgICAjIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODU1My4gVW5mb3J0dW5hdGVseSB0aGlzCisgICAg ICAgICMgcm91dGluZSBpcyBjYWxsZWQgcmlnaHQgYmVmb3JlIHRoZSBsb2dnZXIgaXMgY29uZmln dXJlZCwgc28gaWYgd2UKKyAgICAgICAgIyB0cnkgdG8gX2xvZy53YXJuaW5nKCksIGl0IGdldHMg dGhyb3duIGF3YXkuCisgICAgICAgIGltcG9ydCBzeXMKKyAgICAgICAgc3lzLnN0ZGVyci53cml0 ZSgiRGVmYXVsdGluZyB0byBvbmUgY2hpbGQgLSBzZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTM4NTUzXG4iKQorICAgICAgICByZXR1cm4gMQorCiAgICAgZGVmIGRy aXZlcl9uYW1lKHNlbGYpOgogICAgICAgICAiIiJuYW1lIGZvciB0aGlzIHBvcnQncyBlcXVpdmFs ZW50IG9mIER1bXBSZW5kZXJUcmVlLiIiIgogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnVzZV9k cnQ6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCA0OTBiMGZjLi43N2ZkYTcyIDEwMDc1 NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Vi a2l0X3Rlc3RzLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTEyMzIsMTUgKzEyMzIsMTggQEAgZGVmIHJlYWRf dGVzdF9maWxlcyhmaWxlcyk6CiAgICAgcmV0dXJuIHRlc3RzCiAKIAotZGVmIHJ1bihwb3J0X29i aiwgb3B0aW9ucywgYXJncyk6CitkZWYgcnVuKHBvcnRfb2JqLCBvcHRpb25zLCBhcmdzLCByZWd1 bGFyX291dHB1dD1zeXMuc3RkZXJyLAorICAgICAgICBidWlsZGJvdF9vdXRwdXQ9c3lzLnN0ZG91 dCk6CiAgICAgIiIiUnVuIHRoZSB0ZXN0cy4KIAogICAgIEFyZ3M6CiAgICAgICBwb3J0X29iajog UG9ydCBvYmplY3QgZm9yIHBvcnQtc3BlY2lmaWMgYmVoYXZpb3IKICAgICAgIG9wdGlvbnM6IGEg ZGljdGlvbmFyeSBvZiBjb21tYW5kIGxpbmUgb3B0aW9ucwogICAgICAgYXJnczogYSBsaXN0IG9m IHN1YiBkaXJlY3RvcmllcyBvciBmaWxlcyB0byB0ZXN0Ci0gICAgICBwcmludF9yZXN1bHRzOiB3 aGV0aGVyIG9yIG5vdCB0byBsb2cgYW55dGhpbmcgdG8gc3Rkb3V0LgotICAgICAgICAgIFNldCB0 byBmYWxzZSBieSB0aGUgdW5pdCB0ZXN0cworICAgICAgcmVndWxhcl9vdXRwdXQ6IGEgc3RyZWFt LWxpa2Ugb2JqZWN0IHRoYXQgd2UgY2FuIHNlbmQgbG9nZ2luZy9kZWJ1ZworICAgICAgICAgIG91 dHB1dCB0bworICAgICAgYnVpbGRib3Rfb3V0cHV0OiBhIHN0cmVhbS1saWtlIG9iamVjdCB0aGF0 IHdlIGNhbiB3cml0ZSBhbGwgb3V0cHV0IHRoYXQKKyAgICAgICAgICBpcyBpbnRlbmRlZCB0byBi ZSBwYXJzZWQgYnkgdGhlIGJ1aWxkYm90IHRvCiAgICAgUmV0dXJuczoKICAgICAgIHRoZSBudW1i ZXIgb2YgdW5leHBlY3RlZCByZXN1bHRzIHRoYXQgb2NjdXJyZWQsIG9yIC0xIGlmIHRoZXJlIGlz IGFuCiAgICAgICAgICAgZXJyb3IuCkBAIC0xMjUzLDggKzEyNTYsOCBAQCBkZWYgcnVuKHBvcnRf b2JqLCBvcHRpb25zLCBhcmdzKToKICAgICAgICAgIyBGSVhNRTogSW52ZXN0aWdhdGUgcGVyZi9m bGFraW5lc3MgaW1wYWN0IG9mIHVzaW5nIGNwdV9jb3VudCArIDEuCiAgICAgICAgIG9wdGlvbnMu Y2hpbGRfcHJvY2Vzc2VzID0gcG9ydF9vYmouZGVmYXVsdF9jaGlsZF9wcm9jZXNzZXMoKQogCi0g ICAgcHJpbnRlciA9IHByaW50aW5nLlByaW50ZXIocG9ydF9vYmosIG9wdGlvbnMsIHJlZ3VsYXJf b3V0cHV0PXN5cy5zdGRlcnIsCi0gICAgICAgIGJ1aWxkYm90X291dHB1dD1zeXMuc3Rkb3V0LAor ICAgIHByaW50ZXIgPSBwcmludGluZy5QcmludGVyKHBvcnRfb2JqLCBvcHRpb25zLCByZWd1bGFy X291dHB1dD1yZWd1bGFyX291dHB1dCwKKyAgICAgICAgYnVpbGRib3Rfb3V0cHV0PWJ1aWxkYm90 X291dHB1dCwKICAgICAgICAgY2hpbGRfcHJvY2Vzc2VzPWludChvcHRpb25zLmNoaWxkX3Byb2Nl c3NlcyksCiAgICAgICAgIGlzX2Z1bGx5X3BhcmFsbGVsPW9wdGlvbnMuZXhwZXJpbWVudGFsX2Z1 bGx5X3BhcmFsbGVsKQogICAgIGlmIG9wdGlvbnMuaGVscF9wcmludGluZzoKQEAgLTEzMTYsNyAr MTMxOSw3IEBAIGRlZiBydW4ocG9ydF9vYmosIG9wdGlvbnMsIGFyZ3MpOgogICAgICAgICAgICAg ICAgICAgIChvcHRpb25zLnRpbWVfb3V0X21zLCBvcHRpb25zLnNsb3dfdGltZV9vdXRfbXMpKQog CiAgICAgaWYgaW50KG9wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzKSA9PSAxOgotICAgICAgICBwcmlu dGVyLnByaW50X2NvbmZpZygiUnVubmluZyBvbmUgJXMiICUgcG9ydF9vYmouZHJpdmVyX25hbWUp CisgICAgICAgIHByaW50ZXIucHJpbnRfY29uZmlnKCJSdW5uaW5nIG9uZSAlcyIgJSBwb3J0X29i ai5kcml2ZXJfbmFtZSgpKQogICAgIGVsc2U6CiAgICAgICAgIHByaW50ZXIucHJpbnRfY29uZmln KCJSdW5uaW5nICVzICVzcyBpbiBwYXJhbGxlbCIgJSAoCiAgICAgICAgICAgICAgICAgICAgICAg IG9wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzLCBwb3J0X29iai5kcml2ZXJfbmFtZSgpKSkKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CmluZGV4IDYxMjNlODAuLmRmZTY5 MWUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQpAQCAtMzks NiArMzksMjkgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMgaW1wb3J0IHJ1bl93ZWJraXRf dGVzdHMKIGZyb20gd2Via2l0cHkudGhpcmRwYXJ0eS5tb2NrIGltcG9ydCBNb2NrCiAKIAorY2xh c3MgQXJyYXlTdHJlYW0ob2JqZWN0KToKKyAgICBkZWYgX19pbml0X18oc2VsZik6CisgICAgICAg IHNlbGYuX2NvbnRlbnRzID0gW10KKworICAgIGRlZiB3cml0ZShzZWxmLCBtc2cpOgorICAgICAg ICBzZWxmLl9jb250ZW50cy5hcHBlbmQobXNnKQorCisgICAgZGVmIGdldChzZWxmKToKKyAgICAg ICAgcmV0dXJuIHNlbGYuX2NvbnRlbnRzCisKKyAgICBkZWYgcmVzZXQoc2VsZik6CisgICAgICAg IHNlbGYuX2NvbnRlbnRzID0gW10KKworICAgIGRlZiBlbXB0eShzZWxmKToKKyAgICAgICAgcmV0 dXJuIChsZW4oc2VsZi5fY29udGVudHMpID09IDApCisKKyAgICBkZWYgZmx1c2goc2VsZik6Cisg ICAgICAgIHBhc3MKKworICAgIGRlZiBfX3JlcHJfXyhzZWxmKToKKyAgICAgICAgcmV0dXJuICc8 QXJyYXlTdHJlYW06ICcgKyBzdHIoc2VsZi5fY29udGVudHMpICsgJz4nCisKKwogZGVmIHBhc3Np bmdfcnVuKGFyZ3MsIHBvcnRfb2JqPU5vbmUsIGxvZ2dpbmdfaW5jbHVkZWQ9RmFsc2UpOgogICAg IGlmIG5vdCBsb2dnaW5nX2luY2x1ZGVkOgogICAgICAgICBhcmdzLmV4dGVuZChbJy0tcHJpbnQn LCAnbm90aGluZyddKQpAQCAtNDgsNiArNzEsMTYgQEAgZGVmIHBhc3NpbmdfcnVuKGFyZ3MsIHBv cnRfb2JqPU5vbmUsIGxvZ2dpbmdfaW5jbHVkZWQ9RmFsc2UpOgogICAgIHJlcyA9IHJ1bl93ZWJr aXRfdGVzdHMucnVuKHBvcnRfb2JqLCBvcHRpb25zLCBhcmdzKQogICAgIHJldHVybiByZXMgPT0g MAogCitkZWYgbG9nZ2luZ19ydW4oYXJncyk6CisgICAgb3B0aW9ucywgYXJncyA9IHJ1bl93ZWJr aXRfdGVzdHMucGFyc2VfYXJncyhhcmdzKQorICAgIHBvcnRfb2JqID0gcG9ydC5nZXQob3B0aW9u cy5wbGF0Zm9ybSwgb3B0aW9ucykKKyAgICBidWlsZGJvdF9vdXRwdXQgPSBBcnJheVN0cmVhbSgp CisgICAgcmVndWxhcl9vdXRwdXQgPSBBcnJheVN0cmVhbSgpCisgICAgcmVzID0gcnVuX3dlYmtp dF90ZXN0cy5ydW4ocG9ydF9vYmosIG9wdGlvbnMsIGFyZ3MsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgYnVpbGRib3Rfb3V0cHV0PWJ1aWxkYm90X291dHB1dCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZWd1bGFyX291dHB1dD1yZWd1bGFyX291dHB1dCkKKyAgICBy ZXR1cm4gKHJlcywgYnVpbGRib3Rfb3V0cHV0LCByZWd1bGFyX291dHB1dCkKKwogCiBjbGFzcyBN YWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfZmFzdChzZWxmKToKQEAg LTYzLDYgKzk2LDIwIEBAIGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnLS1wcmludCcsICd1bmV4cGVjdGVkJywK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnZmFzdC9odG1sJ10pKQogCisg ICAgZGVmIHRlc3RfY2hpbGRfcHJvY2Vzc2VzKHNlbGYpOgorICAgICAgICAocmVzLCBidWlsZGJv dF9vdXRwdXQsIHJlZ3VsYXJfb3V0cHV0KSA9IGxvZ2dpbmdfcnVuKAorICAgICAgICAgICAgIFsn LS1wbGF0Zm9ybScsICd0ZXN0JywgJy0tcHJpbnQnLCAnY29uZmlnJywgJy0tY2hpbGQtcHJvY2Vz c2VzJywKKyAgICAgICAgICAgICAgJzEnLCAnZmFzdC9odG1sJ10pCisgICAgICAgIHNlbGYuYXNz ZXJ0VHJ1ZSgnUnVubmluZyBvbmUgRHVtcFJlbmRlclRyZWVcbicKKyAgICAgICAgICAgICAgICAg ICAgICAgIGluIHJlZ3VsYXJfb3V0cHV0LmdldCgpKQorCisgICAgICAgIChyZXMsIGJ1aWxkYm90 X291dHB1dCwgcmVndWxhcl9vdXRwdXQpID0gbG9nZ2luZ19ydW4oCisgICAgICAgICAgICAgWyct LXBsYXRmb3JtJywgJ3Rlc3QnLCAnLS1wcmludCcsICdjb25maWcnLCAnLS1jaGlsZC1wcm9jZXNz ZXMnLAorICAgICAgICAgICAgICAnMicsICdmYXN0L2h0bWwnXSkKKyAgICAgICAgc2VsZi5hc3Nl cnRUcnVlKCdSdW5uaW5nIDIgRHVtcFJlbmRlclRyZWVzIGluIHBhcmFsbGVsXG4nCisgICAgICAg ICAgICAgICAgICAgICAgICBpbiByZWd1bGFyX291dHB1dC5nZXQoKSkKKworCiAKIGNsYXNzIFRl c3RSdW5uZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9yZXN1bHRzX2h0 bWwoc2VsZik6Cg==