104067 2012-12-04 17:15:27 -0800 nrwt: simplify the finding of tests to retry 2012-12-05 15:42:31 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103824 1 dpranke dpranke abarth eric ojan rniwa oldest_to_newest 783139 0 dpranke 2012-12-04 17:15:27 -0800 nrwt: simplify the finding of tests to retry 783141 1 177613 dpranke 2012-12-04 17:19:18 -0800 Created attachment 177613 Patch 783988 2 dpranke 2012-12-05 12:25:47 -0800 Committed r136733: <http://trac.webkit.org/changeset/136733> 784100 3 dpranke 2012-12-05 14:10:50 -0800 Reopening to attach new patch. 784101 4 177827 dpranke 2012-12-05 14:10:52 -0800 Created attachment 177827 fix handling of mapping of TEXT and IMAGE+TEXT onto FAIL/Failure 784119 5 177827 dpranke 2012-12-05 14:30:57 -0800 Comment on attachment 177827 fix handling of mapping of TEXT and IMAGE+TEXT onto FAIL/Failure ignore ... wrong bug. 177613 2012-12-04 17:19:18 -0800 2012-12-05 14:10:47 -0800 Patch bug-104067-20121204171643.patch text/plain 3972 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NTg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2Q4ZmJjNTQ0N2YyNDQxNDlkY2MzNzA5Y2Q1OGMyNzIx ZTAyNzJjYy4uZTUwZjRhMmQ5NzMwMzczN2RkOWJhMjI0NzgwOGU5YTk2MzM4NjEyZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5 IEBACiAyMDEyLTEyLTA0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IHNpbXBsaWZ5IHRoZSBmaW5kaW5nIG9mIHRlc3RzIHRvIHJldHJ5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQwNjcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIHRoaW5rIHRoaXMg bWFrZXMgdGhlIGNvZGUgYSBsaXR0bGUgY2xlYXJlcjsgbm90ZSB0aGF0CisgICAgICAgIHdlIHdl cmUgbm8gbG9uZ2VyIHVzaW5nIHRoZSBpbmNsdWRlX21pc3NpbmcgZmxhZy4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHk6Cisg ICAgICAgIChNYW5hZ2VyLnJ1bik6CisgICAgICAgIChNYW5hZ2VyLl9mYWlsZWRfdGVzdF9uYW1l cyk6CisKKzIwMTItMTItMDQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisK ICAgICAgICAgbnJ3dDogb25seSBzdW1tYXJpemUgdGhlIHJlc3VsdHMgb25lIHdheQogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0MDY0CiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy9tYW5hZ2VyLnB5CmluZGV4IDI3N2YzMGIxYzBmMWI5MTM4ODlkYWRjMjU1Njk0Y2EwYTU5MDJh NTkuLjZhYzgzMDlhNzViOTc4YTJiYzU0Yzg5MmY2OWRjYTc5OTUwYTZlNjEgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlci5weQpAQCAtMzcwLDE1ICszNzAsMTIgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgog ICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnkgPSBzZWxmLl9ydW5fdGVzdHModGVzdHNfdG9fcnVu LCB0ZXN0c190b19za2lwLCBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoLCBzZWxmLl9vcHRpb25z Lml0ZXJhdGlvbnMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbnQoc2VsZi5fb3B0aW9ucy5jaGlsZF9wcm9jZXNzZXMpLCByZXRyeWluZz1GYWxzZSkKIAot ICAgICAgICAgICAgIyBXZSBleGNsdWRlIHRoZSBjcmFzaGVzIGZyb20gdGhlIGxpc3Qgb2YgcmVz dWx0cyB0byByZXRyeSwgYmVjYXVzZQotICAgICAgICAgICAgIyB3ZSB3YW50IHRvIHRyZWF0IGV2 ZW4gYSBwb3RlbnRpYWxseSBmbGFreSBjcmFzaCBhcyBhbiBlcnJvci4KLQotICAgICAgICAgICAg ZmFpbHVyZXMgPSBzZWxmLl9mYWlsZWRfdGVzdF9uYW1lcyhyZXN1bHRfc3VtbWFyeSwgaW5jbHVk ZV9jcmFzaGVzPXNlbGYuX3BvcnQuc2hvdWxkX3JldHJ5X2NyYXNoZXMoKSwgaW5jbHVkZV9taXNz aW5nPUZhbHNlKQotICAgICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5yZXRyeV9mYWlsdXJlcyBh bmQgZmFpbHVyZXMgYW5kIG5vdCByZXN1bHRfc3VtbWFyeS5pbnRlcnJ1cHRlZDoKKyAgICAgICAg ICAgIHRlc3RzX3RvX3JldHJ5ID0gc2VsZi5fdGVzdF90b19yZXRyeShyZXN1bHRfc3VtbWFyeSwg aW5jbHVkZV9jcmFzaGVzPXNlbGYuX3BvcnQuc2hvdWxkX3JldHJ5X2NyYXNoZXMoKSkKKyAgICAg ICAgICAgIGlmIHNlbGYuX29wdGlvbnMucmV0cnlfZmFpbHVyZXMgYW5kIHRlc3RzX3RvX3JldHJ5 IGFuZCBub3QgcmVzdWx0X3N1bW1hcnkuaW50ZXJydXB0ZWQ6CiAgICAgICAgICAgICAgICAgX2xv Zy5pbmZvKCcnKQotICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiUmV0cnlpbmcgJWQgdW5leHBl Y3RlZCBmYWlsdXJlKHMpIC4uLiIgJSBsZW4oZmFpbHVyZXMpKQorICAgICAgICAgICAgICAgIF9s b2cuaW5mbygiUmV0cnlpbmcgJWQgdW5leHBlY3RlZCBmYWlsdXJlKHMpIC4uLiIgJSBsZW4odGVz dHNfdG9fcmV0cnkpKQogICAgICAgICAgICAgICAgIF9sb2cuaW5mbygnJykKLSAgICAgICAgICAg ICAgICByZXRyeV9zdW1tYXJ5ID0gc2VsZi5fcnVuX3Rlc3RzKGZhaWx1cmVzLCB0ZXN0c190b19z a2lwPXNldCgpLCByZXBlYXRfZWFjaD0xLCBpdGVyYXRpb25zPTEsIG51bV93b3JrZXJzPTEsIHJl dHJ5aW5nPVRydWUpCisgICAgICAgICAgICAgICAgcmV0cnlfc3VtbWFyeSA9IHNlbGYuX3J1bl90 ZXN0cyh0ZXN0c190b19yZXRyeSwgdGVzdHNfdG9fc2tpcD1zZXQoKSwgcmVwZWF0X2VhY2g9MSwg aXRlcmF0aW9ucz0xLCBudW1fd29ya2Vycz0xLCByZXRyeWluZz1UcnVlKQogICAgICAgICAgICAg ZWxzZToKICAgICAgICAgICAgICAgICByZXRyeV9zdW1tYXJ5ID0gTm9uZQogICAgICAgICBmaW5h bGx5OgpAQCAtNDY5LDE2ICs0NjYsMTEgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAg ICAgICAgaWYgc2VsZi5fZmlsZXN5c3RlbS5pc2RpcihzZWxmLl9maWxlc3lzdGVtLmpvaW4obGF5 b3V0X3Rlc3RzX2RpciwgZGlybmFtZSkpOgogICAgICAgICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0 ZW0ucm10cmVlKHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwg ZGlybmFtZSkpCiAKLSAgICBkZWYgX2ZhaWxlZF90ZXN0X25hbWVzKHNlbGYsIHJlc3VsdF9zdW1t YXJ5LCBpbmNsdWRlX2NyYXNoZXMsIGluY2x1ZGVfbWlzc2luZyk6Ci0gICAgICAgIGZhaWxlZF90 ZXN0X25hbWVzID0gW10KLSAgICAgICAgZm9yIHRlc3QsIHJlc3VsdCBpbiByZXN1bHRfc3VtbWFy eS51bmV4cGVjdGVkX3Jlc3VsdHMuaXRlcml0ZW1zKCk6Ci0gICAgICAgICAgICBpZiAocmVzdWx0 LnR5cGUgPT0gdGVzdF9leHBlY3RhdGlvbnMuUEFTUyBvcgotICAgICAgICAgICAgICAgIChyZXN1 bHQudHlwZSA9PSB0ZXN0X2V4cGVjdGF0aW9ucy5DUkFTSCBhbmQgbm90IGluY2x1ZGVfY3Jhc2hl cykgb3IKLSAgICAgICAgICAgICAgICAocmVzdWx0LnR5cGUgPT0gdGVzdF9leHBlY3RhdGlvbnMu TUlTU0lORyBhbmQgbm90IGluY2x1ZGVfbWlzc2luZykpOgotICAgICAgICAgICAgICAgIGNvbnRp bnVlCi0gICAgICAgICAgICBmYWlsZWRfdGVzdF9uYW1lcy5hcHBlbmQodGVzdCkKLQotICAgICAg ICByZXR1cm4gZmFpbGVkX3Rlc3RfbmFtZXMKKyAgICBkZWYgX3Rlc3RfdG9fcmV0cnkoc2VsZiwg cmVzdWx0X3N1bW1hcnksIGluY2x1ZGVfY3Jhc2hlcyk6CisgICAgICAgIHJldHVybiBbcmVzdWx0 LnRlc3RfbmFtZSBmb3IgcmVzdWx0IGluIHJlc3VsdF9zdW1tYXJ5LnVuZXhwZWN0ZWRfcmVzdWx0 cy52YWx1ZXMoKSBpZgorICAgICAgICAgICAgICAgICAgICgocmVzdWx0LnR5cGUgIT0gdGVzdF9l eHBlY3RhdGlvbnMuUEFTUykgYW5kCisgICAgICAgICAgICAgICAgICAgIChyZXN1bHQudHlwZSAh PSB0ZXN0X2V4cGVjdGF0aW9ucy5NSVNTSU5HKSBhbmQKKyAgICAgICAgICAgICAgICAgICAgKHJl c3VsdC50eXBlICE9IHRlc3RfZXhwZWN0YXRpb25zLkNSQVNIIG9yIGluY2x1ZGVfY3Jhc2hlcykp XQogCiAgICAgZGVmIF91cGxvYWRfanNvbl9maWxlcyhzZWxmLCBzdW1tYXJpemVkX3Jlc3VsdHMs IHJlc3VsdF9zdW1tYXJ5KToKICAgICAgICAgIiIiV3JpdGVzIHRoZSByZXN1bHRzIG9mIHRoZSB0 ZXN0IHJ1biBhcyBKU09OIGZpbGVzIGludG8gdGhlIHJlc3VsdHMK 177827 2012-12-05 14:10:52 -0800 2012-12-05 14:30:56 -0800 fix handling of mapping of TEXT and IMAGE+TEXT onto FAIL/Failure bug-104067-20121205140817.patch text/plain 15254 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NzMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjhhMjI3MWNhNWYwNzYzMGZhMTdjODc0ZmRkNjRmMmY2 ZmI2OWJmYy4uNTBiYzEyZjUyODkwNzBhNmFjZDE3YTVmM2I1ZDU2NGFhYzNmMjMyZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0 IEBACiAyMDEyLTEyLTA1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG9ubHkgc3VtbWFyaXplIHRoZSByZXN1bHRzIG9uZSB3YXkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDA2NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBtYW5hZ2VyLnN1 bW1hcml6ZV9yZXN1bHRzIHNvIHRoYXQgd2UgYWx3YXlzIChhbmQgb25seSkKKyAgICAgICAgaW5j bHVkZSBib3RoIGV4cGVjdGVkIGFuZCB1bmV4cGVjdGVkIHJlc3VsdHMuIFByZXZpb3VzbHkgd2UK KyAgICAgICAgd291bGQgc3VtbWFyaXplIHRoZSByZXN1bHRzIHR3aWNlLCBvbmNlIHdpdGggZXhw ZWN0ZWQgcmVzdWx0cworICAgICAgICBhbmQgb25jZSB3aXRob3V0LiBUaGlzIG1hZGUgdGhlIGNv ZGUgbXVjaCBtb3JlIGNvbmZ1c2luZyB0aGFuCisgICAgICAgIGl0IG5lZWRlZCB0byBiZS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFn ZXIucHk6CisgICAgICAgIChzdW1tYXJpemVfcmVzdWx0cyk6CisgICAgICAgIChNYW5hZ2VyLnJ1 bik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlcl91bml0dGVzdC5weToKKyAgICAgICAgKFJlc3VsdFN1bW1hcnlUZXN0LnN1bW1hcml6 ZWRfcmVzdWx0cyk6CisgICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X25vX3N2bl9yZXZp c2lvbik6CisgICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X3N2bl9yZXZpc2lvbik6Cisg ICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X3N1bW1hcml6ZWRfcmVzdWx0c193b250Zml4 KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGlu Zy5weToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfcmVzdWx0cyk6CisgICAgICAgIChQcmludGVy Ll9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfdW5l eHBlY3RlZF9yZXN1bHRzLmFkZF9yZXN1bHQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdHBy aW50ZXIudGVzdF9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMuZ2V0X3VuZXhwZWN0ZWRfcmVzdWx0 cyk6CisgICAgICAgIChUZXN0cHJpbnRlcik6CisKKzIwMTItMTItMDUgIERpcmsgUHJhbmtlICA8 ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgbnJ3dDogc2ltcGxpZnkgdGhlIGZpbmRp bmcgb2YgdGVzdHMgdG8gcmV0cnkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNDA2NwogCkBAIC0xMiw3ICs0MSw3IEBACiAgICAgICAgIChNYW5hZ2Vy LnJ1bik6CiAgICAgICAgIChNYW5hZ2VyLl9mYWlsZWRfdGVzdF9uYW1lcyk6CiAKLTIwMTItMTIt MDUgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisyMDEyLTEyLTA0ICBEaXJr IFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIG5yd3Q6IHJlbW92ZSB0 d28gdW51c2VkIHBhcmFtZXRlcnMgZnJvbSBhIGZ1bmN0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQwNTkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Cmlu ZGV4IDcyMWIzNDBkNGNhZTI5NDI0MjFlYjgwN2I4MzhjZmE2ZmYyMzQyMDcuLjBmN2RlMzljNmU4 YTE3ZTFiMzI3ZTJiNTZiMjVjOTEyZjFiYTYwNmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAt ODcsMjAgKzg3LDggQEAgZGVmIHVzZV90cmFjX2xpbmtzX2luX3Jlc3VsdHNfaHRtbChwb3J0X29i aik6CiAjIG9yIHNwbGl0IG9mZiBmcm9tIE1hbmFnZXIgb250byBhbm90aGVyIGhlbHBlciBjbGFz cywgYnV0IHNob3VsZCBub3QgYmUgYSBmcmVlIGZ1bmN0aW9uLgogIyBNb3N0IGxpa2VseSB0aGlz IHNob3VsZCBiZSBtYWRlIGludG8gaXRzIG93biBjbGFzcywgYW5kIHRoaXMgc3VwZXItbG9uZyBm dW5jdGlvbgogIyBzcGxpdCBpbnRvIG1hbnkgaGVscGVyIGZ1bmN0aW9ucy4KLWRlZiBzdW1tYXJp emVfcmVzdWx0cyhwb3J0X29iaiwgZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlf c3VtbWFyeSwgb25seV91bmV4cGVjdGVkKToKLSAgICAiIiJTdW1tYXJpemUgZmFpbGluZyByZXN1 bHRzIGFzIGEgZGljdC4KLQotICAgIEZJWE1FOiBzcGxpdCB0aGlzIGRhdGEgc3RydWN0dXJlIGlu dG8gYSBzZXBhcmF0ZSBjbGFzcz8KLQotICAgIEFyZ3M6Ci0gICAgICAgIHBvcnRfb2JqOiBpbnRl cmZhY2UgdG8gcG9ydC1zcGVjaWZpYyBob29rcwotICAgICAgICBleHBlY3RhdGlvbnM6IHRlc3Rf ZXhwZWN0YXRpb25zLlRlc3RFeHBlY3RhdGlvbnMgb2JqZWN0Ci0gICAgICAgIHJlc3VsdF9zdW1t YXJ5OiBzdW1tYXJ5IG9iamVjdCBmcm9tIGluaXRpYWwgdGVzdCBydW5zCi0gICAgICAgIHJldHJ5 X3N1bW1hcnk6IHN1bW1hcnkgb2JqZWN0IGZyb20gZmluYWwgdGVzdCBydW4gb2YgcmV0cmllZCB0 ZXN0cyAoaWYgYW55KQotICAgICAgICBvbmx5X3VuZXhwZWN0ZWQ6IHdoZXRoZXIgdG8gcmV0dXJu IGEgc3VtbWFyeSBvbmx5IGZvciB0aGUgdW5leHBlY3RlZCByZXN1bHRzCi0gICAgUmV0dXJuczoK LSAgICAgICAgQSBkaWN0aW9uYXJ5IGNvbnRhaW5pbmcgYSBzdW1tYXJ5IG9mIHRoZSB1bmV4cGVj dGVkIHJlc3VsdHMgZnJvbSB0aGUKLSAgICAgICAgcnVuLCB3aXRoIHRoZSBmb2xsb3dpbmcgZmll bGRzOgorZGVmIHN1bW1hcml6ZV9yZXN1bHRzKHBvcnRfb2JqLCBleHBlY3RhdGlvbnMsIHJlc3Vs dF9zdW1tYXJ5LCByZXRyeV9zdW1tYXJ5KToKKyAgICAiIiJSZXR1cm5zIGEgZGljdGlvbmFyeSBj b250YWluaW5nIGEgc3VtbWFyeSBvZiB0aGUgdGVzdCBydW5zLCB3aXRoIHRoZSBmb2xsb3dpbmcg ZmllbGRzOgogICAgICAgICAndmVyc2lvbic6IGEgdmVyc2lvbiBpbmRpY2F0b3IKICAgICAgICAg J2ZpeGFibGUnOiBUaGUgbnVtYmVyIG9mIGZpeGFibGUgdGVzdHMgKE5PVyAtIFBBU1MpCiAgICAg ICAgICdza2lwcGVkJzogVGhlIG51bWJlciBvZiBza2lwcGVkIHRlc3RzIChOT1cgJiBTS0lQUEVE KQpAQCAtMTMwLDkgKzExOCw4IEBAIGRlZiBzdW1tYXJpemVfcmVzdWx0cyhwb3J0X29iaiwgZXhw ZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlfc3VtbWFyeSwgb25sCiAgICAgICAgIGtl eXdvcmRzW21vZGlmaWVyX2VudW1dID0gbW9kaWZpZXJfc3RyaW5nLnVwcGVyKCkKIAogICAgIHRl c3RzID0ge30KLSAgICBvcmlnaW5hbF9yZXN1bHRzID0gcmVzdWx0X3N1bW1hcnkudW5leHBlY3Rl ZF9yZXN1bHRzIGlmIG9ubHlfdW5leHBlY3RlZCBlbHNlIHJlc3VsdF9zdW1tYXJ5LnJlc3VsdHMK IAotICAgIGZvciB0ZXN0X25hbWUsIHJlc3VsdCBpbiBvcmlnaW5hbF9yZXN1bHRzLml0ZXJpdGVt cygpOgorICAgIGZvciB0ZXN0X25hbWUsIHJlc3VsdCBpbiByZXN1bHRfc3VtbWFyeS5yZXN1bHRz Lml0ZXJpdGVtcygpOgogICAgICAgICAjIE5vdGUgdGhhdCBpZiBhIHRlc3QgY3Jhc2hlZCBpbiB0 aGUgb3JpZ2luYWwgcnVuLCB3ZSBpZ25vcmUKICAgICAgICAgIyB3aGV0aGVyIG9yIG5vdCBpdCBj cmFzaGVkIHdoZW4gd2UgcmV0cmllZCBpdCAoaWYgd2UgcmV0cmllZCBpdCksCiAgICAgICAgICMg YW5kIGFsd2F5cyBjb25zaWRlciB0aGUgcmVzdWx0IG5vdCBmbGFreS4KQEAgLTE1OSw3ICsxNDYs OCBAQCBkZWYgc3VtbWFyaXplX3Jlc3VsdHMocG9ydF9vYmosIGV4cGVjdGF0aW9ucywgcmVzdWx0 X3N1bW1hcnksIHJldHJ5X3N1bW1hcnksIG9ubAogICAgICAgICAgICAgaWYgZXhwZWN0ZWQgPT0g J1BBU1MnOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgIGVsaWYgcmVzdWx0X3R5 cGUgPT0gdGVzdF9leHBlY3RhdGlvbnMuQ1JBU0g6Ci0gICAgICAgICAgICBudW1fcmVncmVzc2lv bnMgKz0gMQorICAgICAgICAgICAgaWYgdGVzdF9uYW1lIGluIHJlc3VsdF9zdW1tYXJ5LnVuZXhw ZWN0ZWRfcmVzdWx0czoKKyAgICAgICAgICAgICAgICBudW1fcmVncmVzc2lvbnMgKz0gMQogICAg ICAgICBlbGlmIHJlc3VsdF90eXBlID09IHRlc3RfZXhwZWN0YXRpb25zLk1JU1NJTkc6CiAgICAg ICAgICAgICBpZiB0ZXN0X25hbWUgaW4gcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZF9yZXN1bHRz OgogICAgICAgICAgICAgICAgIG51bV9taXNzaW5nICs9IDEKQEAgLTM5MiwxNiArMzgwLDE0IEBA IGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgaWYgcmV0cnlfc3VtbWFyeToKICAgICAg ICAgICAgIHNlbGYuX2xvb2tfZm9yX25ld19jcmFzaF9sb2dzKHJldHJ5X3N1bW1hcnksIHN0YXJ0 X3RpbWUpCiAKLSAgICAgICAgdW5leHBlY3RlZF9yZXN1bHRzID0gc3VtbWFyaXplX3Jlc3VsdHMo c2VsZi5fcG9ydCwgc2VsZi5fZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlfc3Vt bWFyeSwgb25seV91bmV4cGVjdGVkPVRydWUpCi0KLSAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF9yZXN1bHRzKGVuZF90aW1lIC0gc3RhcnRfdGltZSwgcmVzdWx0X3N1bW1hcnksIHVuZXhwZWN0 ZWRfcmVzdWx0cykKKyAgICAgICAgc3VtbWFyaXplZF9yZXN1bHRzID0gc3VtbWFyaXplX3Jlc3Vs dHMoc2VsZi5fcG9ydCwgc2VsZi5fZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlf c3VtbWFyeSkKKyAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9yZXN1bHRzKGVuZF90aW1lIC0g c3RhcnRfdGltZSwgcmVzdWx0X3N1bW1hcnksIHN1bW1hcml6ZWRfcmVzdWx0cykKIAogICAgICAg ICAjIEZJWE1FOiByZW1vdmUgcmVjb3JkX3Jlc3VsdHMuIEl0J3MganVzdCB1c2VkIGZvciB0ZXN0 aW5nLiBUaGVyZSdzIG5vIG5lZWQKICAgICAgICAgIyBmb3IgaXQgdG8gYmUgYSBjb21tYW5kbGlu ZSBhcmd1bWVudC4KICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5yZWNvcmRfcmVzdWx0cyBhbmQg bm90IHNlbGYuX29wdGlvbnMuZHJ5X3J1bjoKICAgICAgICAgICAgIHNlbGYuX3BvcnQucHJpbnRf bGVha3Nfc3VtbWFyeSgpCiAgICAgICAgICAgICAjIFdyaXRlIHRoZSBzYW1lIGRhdGEgdG8gbG9n IGZpbGVzIGFuZCB1cGxvYWQgZ2VuZXJhdGVkIEpTT04gZmlsZXMgdG8gYXBwZW5naW5lIHNlcnZl ci4KLSAgICAgICAgICAgIHN1bW1hcml6ZWRfcmVzdWx0cyA9IHN1bW1hcml6ZV9yZXN1bHRzKHNl bGYuX3BvcnQsIHNlbGYuX2V4cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIHJldHJ5X3N1bW1h cnksIG9ubHlfdW5leHBlY3RlZD1GYWxzZSkKICAgICAgICAgICAgIHNlbGYuX3VwbG9hZF9qc29u X2ZpbGVzKHN1bW1hcml6ZWRfcmVzdWx0cywgcmVzdWx0X3N1bW1hcnkpCiAKICAgICAgICAgIyBX cml0ZSB0aGUgc3VtbWFyeSB0byBkaXNrIChyZXN1bHRzLmh0bWwpIGFuZCBkaXNwbGF5IGl0IGlm IHJlcXVlc3RlZC4KQEAgLTQxMSw3ICszOTcsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAg ICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnNob3dfcmVzdWx0cyBhbmQgcmVzdWx0X3N1bW1h cnkudW5leHBlY3RlZF9yZXN1bHRzIG9yIChzZWxmLl9vcHRpb25zLmZ1bGxfcmVzdWx0c19odG1s IGFuZCByZXN1bHRfc3VtbWFyeS50b3RhbF9mYWlsdXJlcyk6CiAgICAgICAgICAgICAgICAgc2Vs Zi5fcG9ydC5zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHJlc3VsdHNfcGF0aCkKIAotICAgICAgICBy ZXR1cm4gc2VsZi5fcG9ydC5leGl0X2NvZGVfZnJvbV9zdW1tYXJpemVkX3Jlc3VsdHModW5leHBl Y3RlZF9yZXN1bHRzKQorICAgICAgICByZXR1cm4gc2VsZi5fcG9ydC5leGl0X2NvZGVfZnJvbV9z dW1tYXJpemVkX3Jlc3VsdHMoc3VtbWFyaXplZF9yZXN1bHRzKQogCiAgICAgZGVmIF9ydW5fdGVz dHMoc2VsZiwgdGVzdHNfdG9fcnVuLCB0ZXN0c190b19za2lwLCByZXBlYXRfZWFjaCwgaXRlcmF0 aW9ucywgbnVtX3dvcmtlcnMsIHJldHJ5aW5nKToKICAgICAgICAgbmVlZHNfaHR0cCA9IHNlbGYu X3BvcnQucmVxdWlyZXNfaHR0cF9zZXJ2ZXIoKSBvciBhbnkoc2VsZi5faXNfaHR0cF90ZXN0KHRl c3QpIGZvciB0ZXN0IGluIHRlc3RzX3RvX3J1bikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3Vu aXR0ZXN0LnB5CmluZGV4IDJlNWFiODkxOWEyMTY4NmY4Mjg1N2Y5YzNiNzk0NGU0NGRkYmE0NGYu LmE5YmViNWQ0OGFhMjE4NzhiMmYwOGU2YzUwZWY1NGE4ZDM0NmY5NGQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvbWFuYWdlcl91bml0dGVzdC5weQpAQCAtMTYxLDMzICsxNjEsMzMgQEAgY2xhc3MgUmVz dWx0U3VtbWFyeVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBmb3IgdGVzdCBpbiBl eHRyYV90ZXN0czoKICAgICAgICAgICAgIHJzLmFkZChzZWxmLmdldF9yZXN1bHQodGVzdCwgdGVz dF9leHBlY3RhdGlvbnMuQ1JBU0gpLCBleHBlY3RlZCwgdGVzdF9pc19zbG93KQogCi0gICAgICAg IHJldHJ5ID0gcnMKICAgICAgICAgaWYgZmxha3k6CiAgICAgICAgICAgICBwYXRocywgcmV0cnks IGV4cCA9IHNlbGYuZ2V0X3Jlc3VsdF9zdW1tYXJ5KHBvcnQsIHRlc3RzLCBleHBlY3RhdGlvbnMp CiAgICAgICAgICAgICByZXRyeS5hZGQoc2VsZi5nZXRfcmVzdWx0KCdwYXNzZXMvdGV4dC5odG1s JyksIFRydWUsIHRlc3RfaXNfc2xvdykKICAgICAgICAgICAgIHJldHJ5LmFkZChzZWxmLmdldF9y ZXN1bHQoJ2ZhaWx1cmVzL2V4cGVjdGVkL3RpbWVvdXQuaHRtbCcpLCBUcnVlLCB0ZXN0X2lzX3Ns b3cpCiAgICAgICAgICAgICByZXRyeS5hZGQoc2VsZi5nZXRfcmVzdWx0KCdmYWlsdXJlcy9leHBl Y3RlZC9jcmFzaC5odG1sJyksIFRydWUsIHRlc3RfaXNfc2xvdykKLSAgICAgICAgdW5leHBlY3Rl ZF9yZXN1bHRzID0gc3VtbWFyaXplX3Jlc3VsdHMocG9ydCwgZXhwLCBycywgcmV0cnksIG9ubHlf dW5leHBlY3RlZD1UcnVlKQotICAgICAgICBleHBlY3RlZF9yZXN1bHRzID0gc3VtbWFyaXplX3Jl c3VsdHMocG9ydCwgZXhwLCBycywgcmV0cnksIG9ubHlfdW5leHBlY3RlZD1GYWxzZSkKLSAgICAg ICAgcmV0dXJuIGV4cGVjdGVkX3Jlc3VsdHMsIHVuZXhwZWN0ZWRfcmVzdWx0cworICAgICAgICBl bHNlOgorICAgICAgICAgICAgcmV0cnkgPSBOb25lCisKKyAgICAgICAgcmV0dXJuIHN1bW1hcml6 ZV9yZXN1bHRzKHBvcnQsIGV4cCwgcnMsIHJldHJ5KQogCiAgICAgZGVmIHRlc3Rfbm9fc3ZuX3Jl dmlzaW9uKHNlbGYpOgogICAgICAgICBob3N0ID0gTW9ja0hvc3QoaW5pdGlhbGl6ZV9zY21fYnlf ZGVmYXVsdD1GYWxzZSkKICAgICAgICAgcG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldCgndGVz dCcpCi0gICAgICAgIGV4cGVjdGVkX3Jlc3VsdHMsIHVuZXhwZWN0ZWRfcmVzdWx0cyA9IHNlbGYu c3VtbWFyaXplZF9yZXN1bHRzKHBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBm bGFreT1GYWxzZSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdyZXZpc2lvbicgbm90IGluIHVu ZXhwZWN0ZWRfcmVzdWx0cykKKyAgICAgICAgc3VtbWFyaXplZF9yZXN1bHRzID0gc2VsZi5zdW1t YXJpemVkX3Jlc3VsdHMocG9ydCwgZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5 PUZhbHNlKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3JldmlzaW9uJyBub3QgaW4gc3VtbWFy aXplZF9yZXN1bHRzKQogCiAgICAgZGVmIHRlc3Rfc3ZuX3JldmlzaW9uKHNlbGYpOgogICAgICAg ICBob3N0ID0gTW9ja0hvc3QoaW5pdGlhbGl6ZV9zY21fYnlfZGVmYXVsdD1GYWxzZSkKICAgICAg ICAgcG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldCgndGVzdCcpCiAgICAgICAgIHBvcnQuX29w dGlvbnMuYnVpbGRlcl9uYW1lID0gJ2R1bW15IGJ1aWxkZXInCi0gICAgICAgIGV4cGVjdGVkX3Jl c3VsdHMsIHVuZXhwZWN0ZWRfcmVzdWx0cyA9IHNlbGYuc3VtbWFyaXplZF9yZXN1bHRzKHBvcnQs IGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBmbGFreT1GYWxzZSkKLSAgICAgICAgc2Vs Zi5hc3NlcnROb3RFcXVhbHModW5leHBlY3RlZF9yZXN1bHRzWydyZXZpc2lvbiddLCAnJykKKyAg ICAgICAgc3VtbWFyaXplZF9yZXN1bHRzID0gc2VsZi5zdW1tYXJpemVkX3Jlc3VsdHMocG9ydCwg ZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5PUZhbHNlKQorICAgICAgICBzZWxm LmFzc2VydE5vdEVxdWFscyhzdW1tYXJpemVkX3Jlc3VsdHNbJ3JldmlzaW9uJ10sICcnKQogCiAg ICAgZGVmIHRlc3Rfc3VtbWFyaXplZF9yZXN1bHRzX3dvbnRmaXgoc2VsZik6CiAgICAgICAgIGhv c3QgPSBNb2NrSG9zdCgpCiAgICAgICAgIHBvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5nZXQoJ3Rl c3QnKQogICAgICAgICBwb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdkdW1teSBidWlsZGVy JwogICAgICAgICBwb3J0Ll9maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShwb3J0Ll9maWxlc3lz dGVtLmpvaW4ocG9ydC5sYXlvdXRfdGVzdHNfZGlyKCksICJmYWlsdXJlcy9leHBlY3RlZC93b250 Zml4Lmh0bWwiKSwgIkR1bW15IHRlc3QgY29udGVudHMiKQotICAgICAgICBleHBlY3RlZF9yZXN1 bHRzLCB1bmV4cGVjdGVkX3Jlc3VsdHMgPSBzZWxmLnN1bW1hcml6ZWRfcmVzdWx0cyhwb3J0LCBl eHBlY3RlZD1GYWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UsIGV4dHJhX3Rlc3RzPVsn ZmFpbHVyZXMvZXhwZWN0ZWQvd29udGZpeC5odG1sJ10sIGV4dHJhX2V4cGVjdGF0aW9ucz0nQnVn KHgpIGZhaWx1cmVzL2V4cGVjdGVkL3dvbnRmaXguaHRtbCBbIFdvbnRGaXggXVxuJykKLSAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKGV4cGVjdGVkX3Jlc3VsdHNbJ3Rlc3RzJ11bJ2ZhaWx1cmVzJ11b J2V4cGVjdGVkJ11bJ3dvbnRmaXguaHRtbCddWyd3b250Zml4J10pCisgICAgICAgIHN1bW1hcml6 ZWRfcmVzdWx0cyA9IHNlbGYuc3VtbWFyaXplZF9yZXN1bHRzKHBvcnQsIGV4cGVjdGVkPUZhbHNl LCBwYXNzaW5nPUZhbHNlLCBmbGFreT1GYWxzZSwgZXh0cmFfdGVzdHM9WydmYWlsdXJlcy9leHBl Y3RlZC93b250Zml4Lmh0bWwnXSwgZXh0cmFfZXhwZWN0YXRpb25zPSdCdWcoeCkgZmFpbHVyZXMv ZXhwZWN0ZWQvd29udGZpeC5odG1sIFsgV29udEZpeCBdXG4nKQorICAgICAgICBzZWxmLmFzc2Vy dFRydWUoc3VtbWFyaXplZF9yZXN1bHRzWyd0ZXN0cyddWydmYWlsdXJlcyddWydleHBlY3RlZCdd Wyd3b250Zml4Lmh0bWwnXVsnd29udGZpeCddKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQppbmRleCA3ZjQ0OWY3NjgwMDNk YmI2OWM5MDIwYWM3OTE0MDAwNWI5Yjk3NjdiLi5kZTYxNWY5NWU3YzMyZmUwMGI1ZTQ5MTE1OWE3 MWEwNTU5NzEzMjVhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy92aWV3cy9wcmludGluZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy92aWV3cy9wcmludGluZy5weQpAQCAtMTQ4LDEzICsxNDgsMTMgQEAgY2xhc3MgUHJp bnRlcihvYmplY3QpOgogICAgICAgICAgICAgbmRpZ2l0cyA9IGludChtYXRoLmxvZzEwKGxlbihu dW0pKSkgKyAxCiAgICAgICAgIHJldHVybiBuZGlnaXRzCiAKLSAgICBkZWYgcHJpbnRfcmVzdWx0 cyhzZWxmLCBydW5fdGltZSwgcmVzdWx0X3N1bW1hcnksIHVuZXhwZWN0ZWRfcmVzdWx0cyk6Cisg ICAgZGVmIHByaW50X3Jlc3VsdHMoc2VsZiwgcnVuX3RpbWUsIHJlc3VsdF9zdW1tYXJ5LCBzdW1t YXJpemVkX3Jlc3VsdHMpOgogICAgICAgICBzZWxmLl9wcmludF90aW1pbmdfc3RhdGlzdGljcyhy dW5fdGltZSwgcmVzdWx0X3N1bW1hcnkpCiAgICAgICAgIHNlbGYuX3ByaW50X3Jlc3VsdF9zdW1t YXJ5KHJlc3VsdF9zdW1tYXJ5KQogICAgICAgICBzZWxmLl9wcmludF9vbmVfbGluZV9zdW1tYXJ5 KHJlc3VsdF9zdW1tYXJ5LnRvdGFsIC0gcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWRfc2tpcHMsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnkuZXhwZWN0 ZWQgLSByZXN1bHRfc3VtbWFyeS5leHBlY3RlZF9za2lwcywKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZXN1bHRfc3VtbWFyeS51bmV4cGVjdGVkKQotICAgICAgICBzZWxm Ll9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHModW5leHBlY3RlZF9yZXN1bHRzKQorICAgICAgICBz ZWxmLl9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMoc3VtbWFyaXplZF9yZXN1bHRzKQogCiAgICAg ZGVmIF9wcmludF90aW1pbmdfc3RhdGlzdGljcyhzZWxmLCB0b3RhbF90aW1lLCByZXN1bHRfc3Vt bWFyeSk6CiAgICAgICAgIHNlbGYuX3ByaW50X2RlYnVnKCJUZXN0IHRpbWluZzoiKQpAQCAtNDIz LDcgKzQyMyw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIHJlbHBhdGgg PSAnPG5vbmU+JwogICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCcgICVzOiAlcycgJSAoZXh0 ZW5zaW9uWzE6XSwgcmVscGF0aCkpCiAKLSAgICBkZWYgX3ByaW50X3VuZXhwZWN0ZWRfcmVzdWx0 cyhzZWxmLCB1bmV4cGVjdGVkX3Jlc3VsdHMpOgorICAgIGRlZiBfcHJpbnRfdW5leHBlY3RlZF9y ZXN1bHRzKHNlbGYsIHN1bW1hcml6ZWRfcmVzdWx0cyk6CiAgICAgICAgICMgUHJpbnRzIHRvIHRo ZSBidWlsZGJvdCBzdHJlYW0KICAgICAgICAgcGFzc2VzID0ge30KICAgICAgICAgZmxha3kgPSB7 fQpAQCAtNDM1LDYgKzQzNSwxNCBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgIGRl ZiBhZGRfcmVzdWx0KHRlc3QsIHJlc3VsdHMsIHBhc3Nlcz1wYXNzZXMsIGZsYWt5PWZsYWt5LCBy ZWdyZXNzaW9ucz1yZWdyZXNzaW9ucyk6CiAgICAgICAgICAgICBhY3R1YWwgPSByZXN1bHRzWydh Y3R1YWwnXS5zcGxpdCgiICIpCiAgICAgICAgICAgICBleHBlY3RlZCA9IHJlc3VsdHNbJ2V4cGVj dGVkJ10uc3BsaXQoIiAiKQorCisgICAgICAgICAgICBkZWYgaXNfZXhwZWN0ZWQocmVzdWx0KToK KyAgICAgICAgICAgICAgICByZXR1cm4gKHJlc3VsdCBpbiBleHBlY3RlZCkgb3IgKHJlc3VsdCBp biAoJ1RFWFQnLCAnSU1BR0UrVEVYVCcpIGFuZCAnRkFJTCcgaW4gZXhwZWN0ZWQpCisKKyAgICAg ICAgICAgIGlmIGFsbChpc19leHBlY3RlZChhY3R1YWxfcmVzdWx0KSBmb3IgYWN0dWFsX3Jlc3Vs dCBpbiBhY3R1YWwpOgorICAgICAgICAgICAgICAgICMgRG9uJ3QgcHJpbnQgYW55dGhpbmcgZm9y IHRlc3RzIHRoYXQgcmFuIGFzIGV4cGVjdGVkLgorICAgICAgICAgICAgICAgIHJldHVybgorCiAg ICAgICAgICAgICBpZiBhY3R1YWwgPT0gWydQQVNTJ106CiAgICAgICAgICAgICAgICAgaWYgJ0NS QVNIJyBpbiBleHBlY3RlZDoKICAgICAgICAgICAgICAgICAgICAgYWRkX3RvX2RpY3Rfb2ZfbGlz dHMocGFzc2VzLCAnRXhwZWN0ZWQgdG8gY3Jhc2gsIGJ1dCBwYXNzZWQnLCB0ZXN0KQpAQCAtNDQ4 LDcgKzQ1Niw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICAgICAgYWRkX3RvX2RpY3Rfb2ZfbGlzdHMocmVncmVzc2lvbnMsIHJlc3VsdHNb J2FjdHVhbCddLCB0ZXN0KQogCi0gICAgICAgIHJlc3VsdHNqc29ucGFyc2VyLmZvcl9lYWNoX3Rl c3QodW5leHBlY3RlZF9yZXN1bHRzWyd0ZXN0cyddLCBhZGRfcmVzdWx0KQorICAgICAgICByZXN1 bHRzanNvbnBhcnNlci5mb3JfZWFjaF90ZXN0KHN1bW1hcml6ZWRfcmVzdWx0c1sndGVzdHMnXSwg YWRkX3Jlc3VsdCkKIAogICAgICAgICBpZiBsZW4ocGFzc2VzKSBvciBsZW4oZmxha3kpIG9yIGxl bihyZWdyZXNzaW9ucyk6CiAgICAgICAgICAgICBzZWxmLl9wcmludF9mb3JfYm90KCIiKQpAQCAt NDY5LDcgKzQ3Nyw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICB0 ZXN0cy5zb3J0KCkKIAogICAgICAgICAgICAgICAgIGZvciB0ZXN0IGluIHRlc3RzOgotICAgICAg ICAgICAgICAgICAgICByZXN1bHQgPSByZXN1bHRzanNvbnBhcnNlci5yZXN1bHRfZm9yX3Rlc3Qo dW5leHBlY3RlZF9yZXN1bHRzWyd0ZXN0cyddLCB0ZXN0KQorICAgICAgICAgICAgICAgICAgICBy ZXN1bHQgPSByZXN1bHRzanNvbnBhcnNlci5yZXN1bHRfZm9yX3Rlc3Qoc3VtbWFyaXplZF9yZXN1 bHRzWyd0ZXN0cyddLCB0ZXN0KQogICAgICAgICAgICAgICAgICAgICBhY3R1YWwgPSByZXN1bHRb J2FjdHVhbCddLnNwbGl0KCIgIikKICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWQgPSByZXN1 bHRbJ2V4cGVjdGVkJ10uc3BsaXQoIiAiKQogICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBU ZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OU1trZXkubG93ZXIoKV0KQEAgLTQ4OSw3ICs0OTcs NyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3By aW50X2Zvcl9ib3QoIiAgJXMgWyAlcyBdIiAlICh0ZXN0LCBUZXN0RXhwZWN0YXRpb25QYXJzZXIu X2ludmVydGVkX2V4cGVjdGF0aW9uX3Rva2Vuc1trZXldKSkKICAgICAgICAgICAgICAgICBzZWxm Ll9wcmludF9mb3JfYm90KCIiKQogCi0gICAgICAgIGlmIGxlbih1bmV4cGVjdGVkX3Jlc3VsdHNb J3Rlc3RzJ10pIGFuZCBzZWxmLl9vcHRpb25zLmRlYnVnX3J3dF9sb2dnaW5nOgorICAgICAgICBp ZiBsZW4oc3VtbWFyaXplZF9yZXN1bHRzWyd0ZXN0cyddKSBhbmQgc2VsZi5fb3B0aW9ucy5kZWJ1 Z19yd3RfbG9nZ2luZzoKICAgICAgICAgICAgIHNlbGYuX3ByaW50X2Zvcl9ib3QoIiVzIiAlICgi LSIgKiA3OCkpCiAKICAgICBkZWYgX3ByaW50X3F1aWV0KHNlbGYsIG1zZyk6CmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50 aW5nX3VuaXR0ZXN0LnB5CmluZGV4IGI1NzJiMDNmZjI2ZTM3MzVmOTQzODE0NGExZGFiMjVmMGNl OGFmODEuLmFhNzk1OTJhM2M5ZTczN2I4NjJkNDJkMDlkNzlkOGI3M2M3YWNmYjYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3Vu aXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdz L3ByaW50aW5nX3VuaXR0ZXN0LnB5CkBAIC0xOTMsMTQgKzE5MywxMyBAQCBjbGFzcyAgVGVzdHBy aW50ZXIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgICAgIHJzLmFkZChzZWxmLmdl dF9yZXN1bHQoJ3Bhc3Nlcy90ZXh0Lmh0bWwnLCB0ZXN0X2V4cGVjdGF0aW9ucy5USU1FT1VUKSwg ZXhwZWN0ZWQsIHRlc3RfaXNfc2xvdykKICAgICAgICAgICAgICAgICBycy5hZGQoc2VsZi5nZXRf cmVzdWx0KCdmYWlsdXJlcy9leHBlY3RlZC90aW1lb3V0Lmh0bWwnLCB0ZXN0X2V4cGVjdGF0aW9u cy5DUkFTSCksIGV4cGVjdGVkLCB0ZXN0X2lzX3Nsb3cpCiAgICAgICAgICAgICAgICAgcnMuYWRk KHNlbGYuZ2V0X3Jlc3VsdCgnZmFpbHVyZXMvZXhwZWN0ZWQvY3Jhc2guaHRtbCcsIHRlc3RfZXhw ZWN0YXRpb25zLlRJTUVPVVQpLCBleHBlY3RlZCwgdGVzdF9pc19zbG93KQotICAgICAgICAgICAg cmV0cnkgPSBycworICAgICAgICAgICAgcmV0cnkgPSBOb25lCiAgICAgICAgICAgICBpZiBmbGFr eToKICAgICAgICAgICAgICAgICBwYXRocywgcmV0cnksIGV4cCA9IHNlbGYuZ2V0X3Jlc3VsdF9z dW1tYXJ5KHRlc3RzLCBleHBlY3RhdGlvbnMpCiAgICAgICAgICAgICAgICAgcmV0cnkuYWRkKHNl bGYuZ2V0X3Jlc3VsdCgncGFzc2VzL3RleHQuaHRtbCcpLCBUcnVlLCB0ZXN0X2lzX3Nsb3cpCiAg ICAgICAgICAgICAgICAgcmV0cnkuYWRkKHNlbGYuZ2V0X3Jlc3VsdCgnZmFpbHVyZXMvZXhwZWN0 ZWQvdGltZW91dC5odG1sJyksIFRydWUsIHRlc3RfaXNfc2xvdykKICAgICAgICAgICAgICAgICBy ZXRyeS5hZGQoc2VsZi5nZXRfcmVzdWx0KCdmYWlsdXJlcy9leHBlY3RlZC9jcmFzaC5odG1sJyks IFRydWUsIHRlc3RfaXNfc2xvdykKLSAgICAgICAgICAgIHVuZXhwZWN0ZWRfcmVzdWx0cyA9IG1h bmFnZXIuc3VtbWFyaXplX3Jlc3VsdHMoc2VsZi5fcG9ydCwgZXhwLCBycywgcmV0cnksIG9ubHlf dW5leHBlY3RlZD1UcnVlKQotICAgICAgICAgICAgcmV0dXJuIHVuZXhwZWN0ZWRfcmVzdWx0cwor ICAgICAgICAgICAgcmV0dXJuIG1hbmFnZXIuc3VtbWFyaXplX3Jlc3VsdHMoc2VsZi5fcG9ydCwg ZXhwLCBycywgcmV0cnkpCiAKICAgICAgICAgdGVzdHMgPSBbJ3Bhc3Nlcy90ZXh0Lmh0bWwnLCAn ZmFpbHVyZXMvZXhwZWN0ZWQvdGltZW91dC5odG1sJywgJ2ZhaWx1cmVzL2V4cGVjdGVkL2NyYXNo Lmh0bWwnXQogICAgICAgICBleHBlY3RhdGlvbnMgPSAnJwo=