50701 2010-12-08 11:26:49 -0800 [chromium] remove --use-drt and add --use-test-shell 2010-12-10 11:24:42 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 tony tony abarth dpranke eric ojan tkent oldest_to_newest 318907 0 tony 2010-12-08 11:26:49 -0800 [chromium] remove --use-drt and add --use-test-shell 318909 1 75934 tony 2010-12-08 11:28:47 -0800 Created attachment 75934 Patch 318918 2 dpranke 2010-12-08 11:40:28 -0800 Patch LGTM as well ... Do we still use the ChromiumDriver code on Windows and Linux and only use the WebKitDriver code on the Mac? I wonder if that has something to do with the flakiness I'm seeing. 318930 3 tony 2010-12-08 12:04:52 -0800 (In reply to comment #2) > Do we still use the ChromiumDriver code on Windows and Linux and only use the WebKitDriver code on the Mac? I wonder if that has something to do with the flakiness I'm seeing. Yes, I think that's right. I swapped to ChromiumDriver on Linux because of random test timeouts, so it might be related. We should probably just switch to ChromiumDriver until we can figure out why WebKitDriver is flaky for Chromium DRT. 318943 4 dpranke 2010-12-08 12:26:59 -0800 (In reply to comment #3) > (In reply to comment #2) > > Do we still use the ChromiumDriver code on Windows and Linux and only use the WebKitDriver code on the Mac? I wonder if that has something to do with the flakiness I'm seeing. > > Yes, I think that's right. I swapped to ChromiumDriver on Linux because of random test timeouts, so it might be related. We should probably just switch to ChromiumDriver until we can figure out why WebKitDriver is flaky for Chromium DRT. Okay, I'll test that locally and report back. 320234 5 76219 tony 2010-12-10 10:39:44 -0800 Created attachment 76219 Patch 320235 6 tony 2010-12-10 10:40:33 -0800 I found a few more uses of use_drt outside of the layout_tests dir (e.g., the ews bots) so I updated the patch. 320261 7 tony 2010-12-10 11:24:42 -0800 Committed r73748: <http://trac.webkit.org/changeset/73748> 75934 2010-12-08 11:28:47 -0800 2010-12-10 10:39:41 -0800 Patch bug-50701-20101208112937.patch text/plain 17284 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmNjJkMDk4MmE5OTViMTE2NWFkZWZhNGUyNmE4MTBmMzFlZGU1YjkwLi5lMTliMjNk ZDc5NWEyNDY0OTk4NTNlMGNmYzQ2Yjg4NzhmNmJkMDg0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMTItMDggIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIHJlbW92ZSAt LXVzZS1kcnQgYW5kIGFkZCAtLXVzZS10ZXN0LXNoZWxsCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDcwMQorCisgICAgICAgIEFsc28gcmVtb3ZlIGRy dF9leHBlY3RhdGlvbnMudHh0IHNpbmNlIHdlIGRvbid0IG5lZWQgaXQgYW55bW9yZS4KKworICAg ICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL2RydF9leHBlY3RhdGlvbnMudHh0OiBSZW1vdmVkLgor CiAyMDEwLTEyLTA4ICBYaWFvbWVpIEppICA8eGppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBEYXZpZCBIeWF0dC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2Nocm9taXVtL2RydF9leHBlY3RhdGlvbnMudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hy b21pdW0vZHJ0X2V4cGVjdGF0aW9ucy50eHQKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IGNkNmI2YmJjYzA0ZWUzNzMwNjJmMGZlMzFlMTcxNWU5ZDUzYTFhOGEuLjAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hy b21pdW0vZHJ0X2V4cGVjdGF0aW9ucy50eHQKKysrIC9kZXYvbnVsbApAQCAtMSwyICswLDAgQEAK LS8vIFdlIGFyZSBzd2l0Y2hpbmcgZnJvbSB0ZXN0X3NoZWxsIHRvIERSVCBzb29uIGFuZCB0aGlz IGZpbGUgd2lsbCBnbyBhd2F5LgotLy8gUGxlYXNlIGFkZCBEUlQgZXhwZWN0YXRpb25zIHRvIHRl c3RfZXhwZWN0YXRpb25zLnR4dCBpbnN0ZWFkLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDgwNDlkYmYyOGE3ZWIxOTljZTI2 ZjYwMjIwYmVjODQ1YmIwZTUwNjUuLjFiNTQ0MTQ5YjU3MzAwMDZhNjE5MTA4MWUxYmYxOTFhZDhh MWY0NDkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0xMi0wOCAgVG9ueSBDaGFuZyAgPHRv bnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtjaHJvbWl1bV0gcmVtb3ZlIC0tdXNlLWRydCBhbmQgYWRkIC0tdXNlLXRlc3Qt c2hlbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUw NzAxCisKKyAgICAgICAgQWxzbyByZW1vdmUgY29kZSBmb3IgZHJ0X2V4cGVjdGF0aW9ucy50eHQg c2luY2Ugd2UgZG9uJ3QgbmVlZCBpdAorICAgICAgICBhbnltb3JlLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weToKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdV91bml0 dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtX2xpbnV4LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fbWFjLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKwogMjAxMC0xMi0w OCAgQW50b25pbyBHb21lcyAgPGFnb21lc0ByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE1hcnRpbiBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CmluZGV4IDhmZTY4NWFmMDY2OWVi MzRhZmU4Zjk0YzU2ZmUzZmYzY2Q5NTM2YzcuLmQ3OTE4NzYwNzNiNDZhNTNkYjExYjg2Y2RjZjMy NmMzM2E3Y2YzOTIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQpAQCAtMTc1LDkgKzE3NSw5IEBAIGNs YXNzIENocm9taXVtUG9ydChiYXNlLlBvcnQpOgogICAgICAgICByZXR1cm4gcmVzdWx0CiAKICAg ICBkZWYgZHJpdmVyX25hbWUoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMudXNlX2Ry dDoKLSAgICAgICAgICAgIHJldHVybiAiRHVtcFJlbmRlclRyZWUiCi0gICAgICAgIHJldHVybiAi dGVzdF9zaGVsbCIKKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy51c2VfdGVzdF9zaGVsbDoKKyAg ICAgICAgICAgIHJldHVybiAidGVzdF9zaGVsbCIKKyAgICAgICAgcmV0dXJuICJEdW1wUmVuZGVy VHJlZSIKIAogICAgIGRlZiBwYXRoX2Zyb21fY2hyb21pdW1fYmFzZShzZWxmLCAqY29tcHMpOgog ICAgICAgICAiIiJSZXR1cm5zIHRoZSBmdWxsIHBhdGggdG8gcGF0aCBtYWRlIGJ5IGpvaW5pbmcg dGhlIHRvcCBvZiB0aGUKQEAgLTIxNiw3ICsyMTYsNyBAQCBjbGFzcyBDaHJvbWl1bVBvcnQoYmFz ZS5Qb3J0KToKIAogICAgIGRlZiBjcmVhdGVfZHJpdmVyKHNlbGYsIHdvcmtlcl9udW1iZXIpOgog ICAgICAgICAiIiJTdGFydHMgYSBuZXcgRHJpdmVyIGFuZCByZXR1cm5zIGEgaGFuZGxlIHRvIGl0 LiIiIgotICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3VzZV9kcnQnKSBhbmQgc3lzLnBsYXRm b3JtID09ICdkYXJ3aW4nOgorICAgICAgICBpZiBub3Qgc2VsZi5nZXRfb3B0aW9uKCd1c2VfdGVz dF9zaGVsbCcpIGFuZCBzeXMucGxhdGZvcm0gPT0gJ2Rhcndpbic6CiAgICAgICAgICAgICByZXR1 cm4gd2Via2l0LldlYktpdERyaXZlcihzZWxmLCB3b3JrZXJfbnVtYmVyKQogICAgICAgICByZXR1 cm4gQ2hyb21pdW1Ecml2ZXIoc2VsZiwgd29ya2VyX251bWJlcikKIApAQCAtMjUzLDE2ICsyNTMs NiBAQCBjbGFzcyBDaHJvbWl1bVBvcnQoYmFzZS5Qb3J0KToKICAgICAgICAgICAgIHJldHVybiBm aWxlLnJlYWQoKQogCiAgICAgZGVmIHRlc3RfZXhwZWN0YXRpb25zX292ZXJyaWRlcyhzZWxmKToK LSAgICAgICAgIyBGSVhNRTogVGhpcyBkcnRfb3ZlcnJpZGVzIGhhbmRsaW5nIHNob3VsZCBiZSBy ZW1vdmVkIHdoZW4gd2Ugc3dpdGNoCi0gICAgICAgICMgZnJvbSB0ZXNfc2hlbGwgdG8gRFJULgot ICAgICAgICBkcnRfb3ZlcnJpZGVzID0gJycKLSAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd1 c2VfZHJ0Jyk6Ci0gICAgICAgICAgICBkcnRfb3ZlcnJpZGVzX3BhdGggPSBzZWxmLnBhdGhfZnJv bV93ZWJraXRfYmFzZSgnTGF5b3V0VGVzdHMnLAotICAgICAgICAgICAgICAgICdwbGF0Zm9ybScs ICdjaHJvbWl1bScsICdkcnRfZXhwZWN0YXRpb25zLnR4dCcpCi0gICAgICAgICAgICBpZiBvcy5w YXRoLmV4aXN0cyhkcnRfb3ZlcnJpZGVzX3BhdGgpOgotICAgICAgICAgICAgICAgIHdpdGggY29k ZWNzLm9wZW4oZHJ0X292ZXJyaWRlc19wYXRoLCAiciIsICJ1dGYtOCIpIGFzIGZpbGU6Ci0gICAg ICAgICAgICAgICAgICAgIGRydF9vdmVycmlkZXMgPSBmaWxlLnJlYWQoKQotCiAgICAgICAgIHRy eToKICAgICAgICAgICAgIG92ZXJyaWRlc19wYXRoID0gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1f YmFzZSgnd2Via2l0JywgJ3Rvb2xzJywKICAgICAgICAgICAgICAgICAnbGF5b3V0X3Rlc3RzJywg J3Rlc3RfZXhwZWN0YXRpb25zLnR4dCcpCkBAIC0yNzEsNyArMjYxLDcgQEAgY2xhc3MgQ2hyb21p dW1Qb3J0KGJhc2UuUG9ydCk6CiAgICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhvdmVycmlk ZXNfcGF0aCk6CiAgICAgICAgICAgICByZXR1cm4gTm9uZQogICAgICAgICB3aXRoIGNvZGVjcy5v cGVuKG92ZXJyaWRlc19wYXRoLCAiciIsICJ1dGYtOCIpIGFzIGZpbGU6Ci0gICAgICAgICAgICBy ZXR1cm4gZmlsZS5yZWFkKCkgKyBkcnRfb3ZlcnJpZGVzCisgICAgICAgICAgICByZXR1cm4gZmls ZS5yZWFkKCkKIAogICAgIGRlZiBza2lwcGVkX2xheW91dF90ZXN0cyhzZWxmLCBleHRyYV90ZXN0 X2ZpbGVzPU5vbmUpOgogICAgICAgICBleHBlY3RhdGlvbnNfc3RyID0gc2VsZi50ZXN0X2V4cGVj dGF0aW9ucygpCkBAIC0zNTAsOSArMzQwLDkgQEAgY2xhc3MgQ2hyb21pdW1Qb3J0KGJhc2UuUG9y dCk6CiAgICAgICAgIHJldHVybiBwYXRoCiAKICAgICBkZWYgX3BhdGhfdG9faW1hZ2VfZGlmZihz ZWxmKToKLSAgICAgICAgYmluYXJ5X25hbWUgPSAnaW1hZ2VfZGlmZicKLSAgICAgICAgaWYgc2Vs Zi5nZXRfb3B0aW9uKCd1c2VfZHJ0Jyk6Ci0gICAgICAgICAgICBiaW5hcnlfbmFtZSA9ICdJbWFn ZURpZmYnCisgICAgICAgIGJpbmFyeV9uYW1lID0gJ0ltYWdlRGlmZicKKyAgICAgICAgaWYgc2Vs Zi5nZXRfb3B0aW9uKCd1c2VfdGVzdF9zaGVsbCcpOgorICAgICAgICAgICAgYmluYXJ5X25hbWUg PSAnaW1hZ2VfZGlmZicKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5nZXRf b3B0aW9uKCdjb25maWd1cmF0aW9uJyksIGJpbmFyeV9uYW1lKQogCiAKQEAgLTM3NiwxMCArMzY2 LDEwIEBAIGNsYXNzIENocm9taXVtRHJpdmVyKGJhc2UuRHJpdmVyKToKICAgICAgICAgICAgIGNt ZC5hcHBlbmQoIi0tcGl4ZWwtdGVzdHM9IiArCiAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYu X3BvcnQuX2NvbnZlcnRfcGF0aChzZWxmLl9pbWFnZV9wYXRoKSkKIAotICAgICAgICBpZiBzZWxm Ll9wb3J0LmdldF9vcHRpb24oJ3VzZV9kcnQnKToKLSAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0t dGVzdC1zaGVsbCcpCi0gICAgICAgIGVsc2U6CisgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29w dGlvbigndXNlX3Rlc3Rfc2hlbGwnKToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tbGF5b3V0 LXRlc3RzJykKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tdGVzdC1z aGVsbCcpCiAKICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdzdGFydHVwX2RpYWxv ZycpOgogICAgICAgICAgICAgY21kLmFwcGVuZCgnLS10ZXN0c2hlbGwtc3RhcnR1cC1kaWFsb2cn KQpAQCAtMzkzLDExICszODMsMTIgQEAgY2xhc3MgQ2hyb21pdW1Ecml2ZXIoYmFzZS5Ecml2ZXIp OgogICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ211bHRpcGxlX2xvYWRzJykgPiAw OgogICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1tdWx0aXBsZS1sb2Fkcz0nICsgc3RyKHNlbGYu X3BvcnQuZ2V0X29wdGlvbignbXVsdGlwbGVfbG9hZHMnKSkpCiAKLSAgICAgICAgaWYgc2VsZi5f cG9ydC5nZXRfb3B0aW9uKCdhY2NlbGVyYXRlZF9jb21wb3NpdGluZycpOgotICAgICAgICAgICAg Y21kLmFwcGVuZCgnLS1lbmFibGUtYWNjZWxlcmF0ZWQtY29tcG9zaXRpbmcnKQotCi0gICAgICAg IGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignYWNjZWxlcmF0ZWRfMmRfY2FudmFzJyk6Ci0gICAg ICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMnKQorICAg ICAgICAjIHRlc3Rfc2hlbGwgZG9lcyBub3Qgc3VwcG9ydCBhY2NlbGVyYXRlZCBjb21wb3NpdGlu Zy4KKyAgICAgICAgaWYgbm90IHNlbGYuX3BvcnQuZ2V0X29wdGlvbigidXNlX3Rlc3Rfc2hlbGwi KToKKyAgICAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignYWNjZWxlcmF0ZWRfY29t cG9zaXRpbmcnKToKKyAgICAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJsZS1hY2NlbGVy YXRlZC1jb21wb3NpdGluZycpCisgICAgICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24o J2FjY2VsZXJhdGVkXzJkX2NhbnZhcycpOgorICAgICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0t ZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZhcycpCiAgICAgICAgIHJldHVybiBjbWQKIAogICAg IGRlZiBzdGFydChzZWxmKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHUucHkKaW5kZXggNTRhMGZl ZTNlNmFkZjA1YTY4NGI5ZTUzMmQxZTZhMTcwM2FlYWI1Yi4uYzFmNWM4ZDY5YzdhNDBkYzNmNDlm ZTk2NzE2ZjIwNDI1MGQxMTU4NiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHUucHkKKysrIGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHUucHkKQEAgLTY5 LDggKzY5LDYgQEAgZGVmIF9zZXRfZ3B1X29wdGlvbnMob3B0aW9ucyk6CiAgICAgICAgICAgICBv cHRpb25zLmFjY2VsZXJhdGVkX2NvbXBvc2l0aW5nID0gVHJ1ZQogICAgICAgICBpZiBvcHRpb25z LmFjY2VsZXJhdGVkXzJkX2NhbnZhcyBpcyBOb25lOgogICAgICAgICAgICAgb3B0aW9ucy5hY2Nl bGVyYXRlZF8yZF9jYW52YXMgPSBUcnVlCi0gICAgICAgIGlmIG9wdGlvbnMudXNlX2RydCBpcyBO b25lOgotICAgICAgICAgICAgb3B0aW9ucy51c2VfZHJ0ID0gVHJ1ZQogCiAgICAgICAgICMgRklY TUU6IFJlbW92ZSB0aGlzIGFmdGVyIGh0dHA6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy81MTMz MDAxLyBpcyBlbmFibGVkCiAgICAgICAgICMgb24gdGhlIGJvdHMuCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdV91 bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5CmluZGV4IDAzYmM5OGFmYjM0MDcwN2MzM2VmMTY0 OWZhNDljNDYwMzkxZTQ1OTcuLmFkMDQwNGNmZmU0NzkwZjllZGUzMTEzMTNkMWQ0ZDhmY2E2OTM2 MDUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5CkBAIC00 NiwxMiArNDYsMTAgQEAgY2xhc3MgQ2hyb21pdW1HcHVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgbW9ja19vcHRpb25zID0gbW9ja3Rvb2wuTW9ja09wdGlvbnMoYWNjZWxlcmF0ZWRf Y29tcG9zaXRpbmc9Tm9uZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYWNjZWxlcmF0ZWRfMmRfY2FudmFzPU5vbmUsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGJ1aWxkZXJfbmFtZT0nZm9vJywKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNlX2RydD1Ob25lLAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjaGlsZF9wcm9jZXNzZXM9Tm9uZSkKICAg ICAgICAgcG9ydCA9IGNocm9taXVtX2dwdS5nZXQocG9ydF9uYW1lPXBvcnRfbmFtZSwgb3B0aW9u cz1tb2NrX29wdGlvbnMpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll9vcHRpb25zLmFj Y2VsZXJhdGVkX2NvbXBvc2l0aW5nKQogICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5fb3B0 aW9ucy5hY2NlbGVyYXRlZF8yZF9jYW52YXMpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0 Ll9vcHRpb25zLnVzZV9kcnQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5kZWZhdWx0 X2NoaWxkX3Byb2Nlc3NlcygpLCAxKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuX29w dGlvbnMuYnVpbGRlcl9uYW1lLCAnZm9vIC0gR1BVJykKIApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f bGludXgucHkKaW5kZXggYjI2YTZiNTc0MTU3M2YyYjdlNDM2OTJiOGQxYjNhNjkxZDhkZWQwNy4u NWQ5ZGQ4NzRhOWRmYmNmYmIxYTIzOWFhMDRjYWE5NGNhZTI2MDBhNyAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51 eC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX2xpbnV4LnB5CkBAIC04MSw3ICs4MSw3IEBAIGNsYXNzIENocm9taXVtTGludXhQ b3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAgICAgICAgIGJhc2UgPSBzZWxmLnBhdGhfZnJv bV9jaHJvbWl1bV9iYXNlKCkKICAgICAgICAgaWYgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2lu KGJhc2UsICdzY29uc2J1aWxkJykpOgogICAgICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihi YXNlLCAnc2NvbnNidWlsZCcsICpjb21wcykKLSAgICAgICAgaWYgb3MucGF0aC5leGlzdHMob3Mu cGF0aC5qb2luKGJhc2UsICdvdXQnLCAqY29tcHMpKSBvciBub3Qgc2VsZi5nZXRfb3B0aW9uKCd1 c2VfZHJ0Jyk6CisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihiYXNlLCAn b3V0JywgKmNvbXBzKSkgb3Igc2VsZi5nZXRfb3B0aW9uKCd1c2VfdGVzdF9zaGVsbCcpOgogICAg ICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihiYXNlLCAnb3V0JywgKmNvbXBzKQogICAgICAg ICBiYXNlID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKQogICAgICAgICBpZiBvcy5wYXRo LmV4aXN0cyhvcy5wYXRoLmpvaW4oYmFzZSwgJ3Njb25zYnVpbGQnKSk6CkBAIC0xNDgsOSArMTQ4 LDkgQEAgY2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAg ICBkZWYgX3BhdGhfdG9fZHJpdmVyKHNlbGYsIGNvbmZpZ3VyYXRpb249Tm9uZSk6CiAgICAgICAg IGlmIG5vdCBjb25maWd1cmF0aW9uOgogICAgICAgICAgICAgY29uZmlndXJhdGlvbiA9IHNlbGYu Z2V0X29wdGlvbignY29uZmlndXJhdGlvbicpCi0gICAgICAgIGJpbmFyeV9uYW1lID0gJ3Rlc3Rf c2hlbGwnCi0gICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX2RydCcpOgotICAgICAgICAg ICAgYmluYXJ5X25hbWUgPSAnRHVtcFJlbmRlclRyZWUnCisgICAgICAgIGJpbmFyeV9uYW1lID0g J0R1bXBSZW5kZXJUcmVlJworICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3VzZV90ZXN0X3No ZWxsJyk6CisgICAgICAgICAgICBiaW5hcnlfbmFtZSA9ICd0ZXN0X3NoZWxsJwogICAgICAgICBy ZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChjb25maWd1cmF0aW9uLCBiaW5hcnlfbmFtZSkKIAogICAg IGRlZiBfcGF0aF90b19oZWxwZXIoc2VsZik6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21hYy5weSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5Cmlu ZGV4IGIwMjNjOTQxY2VhZGVmY2M0NDA1NGI4ZTIyNGY1OWUzNGYxZGI4NGEuLmM4YmQ5NjU5MTk4 ODNiNDg0OGFkZWRiMjU1ZGEwZDcwZDE2ZDM1OWMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFj LnB5CkBAIC03OSw5ICs3OSw5IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5DaHJv bWl1bVBvcnQpOgogCiAgICAgZGVmIGRyaXZlcl9uYW1lKHNlbGYpOgogICAgICAgICAiIiJuYW1l IGZvciB0aGlzIHBvcnQncyBlcXVpdmFsZW50IG9mIER1bXBSZW5kZXJUcmVlLiIiIgotICAgICAg ICBpZiBzZWxmLmdldF9vcHRpb24oJ3VzZV9kcnQnKToKLSAgICAgICAgICAgIHJldHVybiAiRHVt cFJlbmRlclRyZWUiCi0gICAgICAgIHJldHVybiAiVGVzdFNoZWxsIgorICAgICAgICBpZiBzZWxm LmdldF9vcHRpb24oJ3VzZV90ZXN0X3NoZWxsJyk6CisgICAgICAgICAgICByZXR1cm4gIlRlc3RT aGVsbCIKKyAgICAgICAgcmV0dXJuICJEdW1wUmVuZGVyVHJlZSIKIAogICAgIGRlZiB0ZXN0X3Bs YXRmb3JtX25hbWUoc2VsZik6CiAgICAgICAgICMgV2UgdXNlICdtYWMnIGluc3RlYWQgb2YgJ2No cm9taXVtLW1hYycKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5CmluZGV4IDUz OTY1MjIwZmYyYTNhZDk0MGQxZmMxOTAzMmEzY2E5YzA4OTRmNWEuLmM4Nzk4NGZjZDFiY2ZmODhk NWQzN2Y1Y2YxYmFmNGMyNzRjMmNjNzQgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHkKKysrIGIvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0 dGVzdC5weQpAQCAtMTA1LDE4ICsxMDUsMjUgQEAgY2xhc3MgQ2hyb21pdW1Qb3J0VGVzdCh1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICByZXR1cm4gJ2RlZmF1bHQnCiAKICAgICBkZWYg dGVzdF9wYXRoX3RvX2ltYWdlX2RpZmYoc2VsZik6Ci0gICAgICAgIG1vY2tfb3B0aW9ucyA9IG1v Y2t0b29sLk1vY2tPcHRpb25zKHVzZV9kcnQ9VHJ1ZSkKKyAgICAgICAgbW9ja19vcHRpb25zID0g bW9ja3Rvb2wuTW9ja09wdGlvbnMoKQogICAgICAgICBwb3J0ID0gQ2hyb21pdW1Qb3J0VGVzdC5U ZXN0TGludXhQb3J0KG9wdGlvbnM9bW9ja19vcHRpb25zKQogICAgICAgICBzZWxmLmFzc2VydFRy dWUocG9ydC5fcGF0aF90b19pbWFnZV9kaWZmKCkuZW5kc3dpdGgoCiAgICAgICAgICAgICAnL291 dC9kZWZhdWx0L0ltYWdlRGlmZicpLCBtc2c9cG9ydC5fcGF0aF90b19pbWFnZV9kaWZmKCkpCiAg ICAgICAgIHBvcnQgPSBDaHJvbWl1bVBvcnRUZXN0LlRlc3RNYWNQb3J0KG9wdGlvbnM9bW9ja19v cHRpb25zKQogICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC5fcGF0aF90b19pbWFnZV9kaWZm KCkuZW5kc3dpdGgoCiAgICAgICAgICAgICAnL3hjb2RlYnVpbGQvZGVmYXVsdC9JbWFnZURpZmYn KSkKKyAgICAgICAgbW9ja19vcHRpb25zID0gbW9ja3Rvb2wuTW9ja09wdGlvbnModXNlX3Rlc3Rf c2hlbGw9VHJ1ZSkKKyAgICAgICAgcG9ydCA9IENocm9taXVtUG9ydFRlc3QuVGVzdExpbnV4UG9y dChvcHRpb25zPW1vY2tfb3B0aW9ucykKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuX3Bh dGhfdG9faW1hZ2VfZGlmZigpLmVuZHN3aXRoKAorICAgICAgICAgICAgJy9vdXQvZGVmYXVsdC9p bWFnZV9kaWZmJyksIG1zZz1wb3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKSkKKyAgICAgICAgcG9y dCA9IENocm9taXVtUG9ydFRlc3QuVGVzdE1hY1BvcnQob3B0aW9ucz1tb2NrX29wdGlvbnMpCisg ICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKS5lbmRzd2l0 aCgKKyAgICAgICAgICAgICcveGNvZGVidWlsZC9kZWZhdWx0L2ltYWdlX2RpZmYnKSkKICAgICAg ICAgIyBGSVhNRTogRmlndXJlIG91dCBob3cgdGhpcyBpcyBnb2luZyB0byB3b3JrIG9uIFdpbmRv d3MuCiAgICAgICAgICNwb3J0ID0gY2hyb21pdW1fd2luLkNocm9taXVtV2luUG9ydCgndGVzdC1w b3J0Jywgb3B0aW9ucz1Nb2NrT3B0aW9ucygpKQogCiAgICAgZGVmIHRlc3Rfc2tpcHBlZF9sYXlv dXRfdGVzdHMoc2VsZik6Ci0gICAgICAgIG1vY2tfb3B0aW9ucyA9IG1vY2t0b29sLk1vY2tPcHRp b25zKHVzZV9kcnQ9VHJ1ZSkKKyAgICAgICAgbW9ja19vcHRpb25zID0gbW9ja3Rvb2wuTW9ja09w dGlvbnMoKQogICAgICAgICBwb3J0ID0gQ2hyb21pdW1Qb3J0VGVzdC5UZXN0TGludXhQb3J0KG9w dGlvbnM9bW9ja19vcHRpb25zKQogCiAgICAgICAgIGZha2VfdGVzdCA9IG9zLnBhdGguam9pbihw b3J0LmxheW91dF90ZXN0c19kaXIoKSwgImZhc3QvanMvbm90LWdvb2QuanMiKQpAQCAtMTYyLDcg KzE2OSw3IEBAIExJTlVYIFdJTiA6IGZhc3QvanMvdmVyeS1nb29kLmpzID0gVElNRU9VVCBQQVNT IiIiCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBzZWxmLl9yZXN1bHQKICAgICAgICAgICAg ICAgICByZXR1cm4gJycKIAotICAgICAgICBtb2NrX29wdGlvbnMgPSBtb2NrdG9vbC5Nb2NrT3B0 aW9ucyh1c2VfZHJ0PUZhbHNlKQorICAgICAgICBtb2NrX29wdGlvbnMgPSBtb2NrdG9vbC5Nb2Nr T3B0aW9ucygpCiAgICAgICAgIHBvcnQgPSBDaHJvbWl1bVBvcnRUZXN0LlRlc3RMaW51eFBvcnQo bW9ja19vcHRpb25zKQogCiAgICAgICAgICMgSW1hZ2VzIGFyZSBkaWZmZXJlbnQuCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtX3dpbi5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Bv cnQvY2hyb21pdW1fd2luLnB5CmluZGV4IDY5YjUyOWFlMWI0M2FiNGVkNjYzZTBmNmViNDE2NTdl YTZmYjc0NTguLmQwODBmODI0ZDAxM2QxNTU2NzEzMzNmODI2YzI3M2M0ODQ0ZDE2ZDkgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hy b21pdW1fd2luLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fd2luLnB5CkBAIC0xMDUsMTMgKzEwNSwxMiBAQCBjbGFzcyBDaHJv bWl1bVdpblBvcnQoY2hyb21pdW0uQ2hyb21pdW1Qb3J0KToKICAgICAjCiAgICAgIyBQUk9URUNU RUQgUk9VVElORVMKICAgICAjCi0KICAgICBkZWYgX2J1aWxkX3BhdGgoc2VsZiwgKmNvbXBzKToK ICAgICAgICAgcCA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jhc2UoJ3dlYmtpdCcsICpjb21w cykKICAgICAgICAgaWYgb3MucGF0aC5leGlzdHMocCk6CiAgICAgICAgICAgICByZXR1cm4gcAog ICAgICAgICBwID0gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgnY2hyb21lJywgKmNvbXBz KQotICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhwKSBvciBub3Qgc2VsZi5nZXRfb3B0aW9uKCd1 c2VfZHJ0Jyk6CisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHApIG9yIHNlbGYuZ2V0X29wdGlv bigndXNlX3Rlc3Rfc2hlbGwnKToKICAgICAgICAgICAgIHJldHVybiBwCiAgICAgICAgIHJldHVy biBvcy5wYXRoLmpvaW4oc2VsZi5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoKSwgJ1dlYktpdCcsICdj aHJvbWl1bScsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKmNvbXBzKQpAQCAtMTQwLDIx ICsxMzksMjEgQEAgY2xhc3MgQ2hyb21pdW1XaW5Qb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6 CiAgICAgZGVmIF9wYXRoX3RvX2RyaXZlcihzZWxmLCBjb25maWd1cmF0aW9uPU5vbmUpOgogICAg ICAgICBpZiBub3QgY29uZmlndXJhdGlvbjoKICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb24gPSBz ZWxmLmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKQotICAgICAgICBiaW5hcnlfbmFtZSA9ICd0 ZXN0X3NoZWxsLmV4ZScKLSAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd1c2VfZHJ0Jyk6Ci0g ICAgICAgICAgICBiaW5hcnlfbmFtZSA9ICdEdW1wUmVuZGVyVHJlZS5leGUnCisgICAgICAgIGJp bmFyeV9uYW1lID0gJ0R1bXBSZW5kZXJUcmVlLmV4ZScKKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0 aW9uKCd1c2VfdGVzdF9zaGVsbCcpOgorICAgICAgICAgICAgYmluYXJ5X25hbWUgPSAndGVzdF9z aGVsbC5leGUnCiAgICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRoKGNvbmZpZ3VyYXRpb24s IGJpbmFyeV9uYW1lKQogCiAgICAgZGVmIF9wYXRoX3RvX2hlbHBlcihzZWxmKToKLSAgICAgICAg YmluYXJ5X25hbWUgPSAnbGF5b3V0X3Rlc3RfaGVscGVyLmV4ZScKLSAgICAgICAgaWYgc2VsZi5n ZXRfb3B0aW9uKCd1c2VfZHJ0Jyk6Ci0gICAgICAgICAgICBiaW5hcnlfbmFtZSA9ICdMYXlvdXRU ZXN0SGVscGVyLmV4ZScKKyAgICAgICAgYmluYXJ5X25hbWUgPSAnTGF5b3V0VGVzdEhlbHBlci5l eGUnCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX3Rlc3Rfc2hlbGwnKToKKyAgICAg ICAgICAgIGJpbmFyeV9uYW1lID0gJ2xheW91dF90ZXN0X2hlbHBlci5leGUnCiAgICAgICAgIHJl dHVybiBzZWxmLl9idWlsZF9wYXRoKHNlbGYuZ2V0X29wdGlvbignY29uZmlndXJhdGlvbicpLCBi aW5hcnlfbmFtZSkKIAogICAgIGRlZiBfcGF0aF90b19pbWFnZV9kaWZmKHNlbGYpOgotICAgICAg ICBiaW5hcnlfbmFtZSA9ICdpbWFnZV9kaWZmLmV4ZScKLSAgICAgICAgaWYgc2VsZi5nZXRfb3B0 aW9uKCd1c2VfZHJ0Jyk6Ci0gICAgICAgICAgICBiaW5hcnlfbmFtZSA9ICdJbWFnZURpZmYuZXhl JworICAgICAgICBiaW5hcnlfbmFtZSA9ICdJbWFnZURpZmYuZXhlJworICAgICAgICBpZiBzZWxm LmdldF9vcHRpb24oJ3VzZV90ZXN0X3NoZWxsJyk6CisgICAgICAgICAgICBiaW5hcnlfbmFtZSA9 ICdpbWFnZV9kaWZmLmV4ZScKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5n ZXRfb3B0aW9uKCdjb25maWd1cmF0aW9uJyksIGJpbmFyeV9uYW1lKQogCiAgICAgZGVmIF9wYXRo X3RvX3dkaWZmKHNlbGYpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQppbmRleCAwOWJlODMzZDc1MmYwMmZkYjc5 NDQ2NjNiOTBlNTVlYTczMGNlMWExLi5hZmRlYmViMmM4NDZlZDdjY2RmZDJmZmU3ZGIwMjFhZDMx NTIxM2I5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L3dlYmtpdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weQpAQCAtNDAxLDEzICs0MDEsNiBAQCBjbGFzcyBXZWJL aXREcml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24o J3BpeGVsX3Rlc3RzJyk6CiAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLXBpeGVsLXRlc3RzJykK IAotICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ3VzZV9kcnQnKToKLSAgICAgICAg ICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmcnKToK LSAgICAgICAgICAgICAgICBjbWQuYXBwZW5kKCctLWVuYWJsZS1hY2NlbGVyYXRlZC1jb21wb3Np dGluZycpCi0KLSAgICAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignYWNjZWxlcmF0 ZWRfMmRfY2FudmFzJyk6Ci0gICAgICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1lbmFibGUtYWNj ZWxlcmF0ZWQtMmQtY2FudmFzJykKLQogICAgICAgICByZXR1cm4gY21kCiAKICAgICBkZWYgc3Rh cnQoc2VsZik6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCBmM2IxZGEwNjQ2ZDU3Zjg2 OTFjYjA2YWU2NTA3ODQxZTZmYmNlNTRlLi5iMzc1MTNiMDc5N2M5YTdhYTY2OWNkYTE5YmQ3ZWFl N2I5NzhhY2U2IDEwMDc1NQotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTE0MzEsOSArMTQzMSw5 IEBAIGRlZiBwYXJzZV9hcmdzKGFyZ3M9Tm9uZSk6CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCItLW5vY2hlY2stc3lzLWRlcHMiLCBhY3Rpb249InN0b3JlX3RydWUiLAogICAgICAgICAg ICAgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgICAgIGhlbHA9IkRvbid0IGNoZWNrIHRoZSBzeXN0 ZW0gZGVwZW5kZW5jaWVzICh0aGVtZXMpIiksCi0gICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9u KCItLXVzZS1kcnQiLCBhY3Rpb249InN0b3JlX3RydWUiLAotICAgICAgICAgICAgZGVmYXVsdD1U cnVlLAotICAgICAgICAgICAgaGVscD0iKERFUFJFQ0FURUQpIiksCisgICAgICAgIG9wdHBhcnNl Lm1ha2Vfb3B0aW9uKCItLXVzZS10ZXN0LXNoZWxsIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwKKyAg ICAgICAgICAgIGRlZmF1bHQ9RmFsc2UsCisgICAgICAgICAgICBoZWxwPSJVc2UgdGVzdF9zaGVs bCBpbnN0ZWFkIG9mIERSVCIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1hY2Nl bGVyYXRlZC1jb21wb3NpdGluZyIsCiAgICAgICAgICAgICBhY3Rpb249InN0b3JlX3RydWUiLAog ICAgICAgICAgICAgaGVscD0iVXNlIGhhcmR3YXJlLWFjY2VsYXRlZCBjb21wb3NpdGluZyBmb3Ig cmVuZGVyaW5nIiksCg== 76219 2010-12-10 10:39:44 -0800 2010-12-10 11:20:49 -0800 Patch bug-50701-20101210104035.patch text/plain 22362 tony ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAyMDE5ZmRjMDQwZGJjMDA5NzQyYzM0N2NkZDU0YmQ5Y2E5NDU1ODc2Li41NWIxMmNh NDZmMGQxZDhjMDFlMDczZGViNzVkZDU5YWU2NDlkMmEyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMTItMTAgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIHJlbW92ZSAt LXVzZS1kcnQgYW5kIGFkZCAtLXVzZS10ZXN0LXNoZWxsCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MDcwMQorCisgICAgICAgIFJlbW92ZSBkcnRfZXhw ZWN0YXRpb25zLnR4dCBzaW5jZSB3ZSBkb24ndCBuZWVkIGl0IGFueW1vcmUuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9jaHJvbWl1bS9kcnRfZXhwZWN0YXRpb25zLnR4dDogUmVtb3ZlZC4KKwogMjAx MC0xMi0xMCAgUGV0ZXIgS2FzdGluZyAgPHBrYXN0aW5nQGdvb2dsZS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCBDaHJvbWl1bSB0ZXN0IGV4cGVjdGF0aW9uIHVwZGF0ZS4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL2RydF9leHBlY3RhdGlvbnMudHh0IGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vZHJ0X2V4cGVjdGF0aW9ucy50eHQKZGVsZXRlZCBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IGNkNmI2YmJjYzA0ZWUzNzMwNjJmMGZlMzFlMTcxNWU5ZDUz YTFhOGEuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vZHJ0X2V4cGVjdGF0aW9ucy50eHQKKysrIC9kZXYv bnVsbApAQCAtMSwyICswLDAgQEAKLS8vIFdlIGFyZSBzd2l0Y2hpbmcgZnJvbSB0ZXN0X3NoZWxs IHRvIERSVCBzb29uIGFuZCB0aGlzIGZpbGUgd2lsbCBnbyBhd2F5LgotLy8gUGxlYXNlIGFkZCBE UlQgZXhwZWN0YXRpb25zIHRvIHRlc3RfZXhwZWN0YXRpb25zLnR4dCBpbnN0ZWFkLgpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4 IDVhYjkyZTQwMTY1YjQxYzJkODY5ZDU4OWUwNTFkNzY2NzVkNGJhZTIuLjUyNzk3Y2M5ZWU3M2Iw ZTVlNjQ2NGFjNmRkNGQ4OWUxMzNkZTU1YmUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5n ZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0x Mi0xMCAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtjaHJvbWl1bV0gcmVtb3ZlIC0tdXNlLWRy dCBhbmQgYWRkIC0tdXNlLXRlc3Qtc2hlbGwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTUwNzAxCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jb25maWcvcG9ydHMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24v Y29uZmlnL3BvcnRzX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHUucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHVfdW5pdHRlc3QucHk6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX21h Yy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9t aXVtX3VuaXR0ZXN0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW1fd2luLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvd2Via2l0LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weToKKwogMjAxMC0xMi0xMCAgQWxlamFuZHJv IEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBNYXJ0 aW4gUm9iaW5zb24uCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9jb25maWcvcG9ydHMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9jb25maWcvcG9ydHMucHkKaW5kZXggNWYxNWU4ODkxN2E3NWQzYzdhNjAxNjg2ZTJhMGM2MjM2 MWExZmU0ZC4uOTdhMzEwYzU4OWY1MWRjMDkxYjY4ODdkYTNjYmQ0MTkzYjM2Y2E5MyAxMDA2NDQK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29uZmlnL3BvcnRzLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0cy5w eQpAQCAtMjI5LDcgKzIyOSw2IEBAIGNsYXNzIENocm9taXVtUG9ydChXZWJLaXRQb3J0KToKICAg ICAgICAgcmV0dXJuIFsKICAgICAgICAgICAgIGNscy5zY3JpcHRfcGF0aCgibmV3LXJ1bi13ZWJr aXQtdGVzdHMiKSwKICAgICAgICAgICAgICItLWNocm9taXVtIiwKLSAgICAgICAgICAgICItLXVz ZS1kcnQiLAogICAgICAgICAgICAgIi0tbm8tcGl4ZWwtdGVzdHMiLAogICAgICAgICBdCiAKZGlm ZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZpZy9wb3J0 c191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NvbmZp Zy9wb3J0c191bml0dGVzdC5weQppbmRleCAxMjU5ODFhMTBlYjMxOTIxODcyMzU2NThhODhiNGIz MmRjNGI1ZDhiLi44ZjNmM2I5NWJlM2UzNmFlZWI2N2FhMmU3MjE2NjcxMTdlNmRlNDUyIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jb25maWcvcG9ydHNf dW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY29u ZmlnL3BvcnRzX3VuaXR0ZXN0LnB5CkBAIC02NCwxMyArNjQsMTMgQEAgY2xhc3MgV2ViS2l0UG9y dFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X2Nocm9taXVtX3BvcnQoc2Vs Zik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9ydC5uYW1lKCksICJDaHJv bWl1bSIpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9ydC5mbGFnKCksICIt LXBvcnQ9Y2hyb21pdW0iKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJvbWl1bVBvcnQu cnVuX3dlYmtpdF90ZXN0c19jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJuZXct cnVuLXdlYmtpdC10ZXN0cyIpLCAiLS1jaHJvbWl1bSIsICItLXVzZS1kcnQiLCAiLS1uby1waXhl bC10ZXN0cyJdKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhDaHJvbWl1bVBvcnQucnVuX3dl YmtpdF90ZXN0c19jb21tYW5kKCksIFtXZWJLaXRQb3J0LnNjcmlwdF9wYXRoKCJuZXctcnVuLXdl YmtpdC10ZXN0cyIpLCAiLS1jaHJvbWl1bSIsICItLW5vLXBpeGVsLXRlc3RzIl0pCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9ydC5idWlsZF93ZWJraXRfY29tbWFuZCgpLCBb V2ViS2l0UG9ydC5zY3JpcHRfcGF0aCgiYnVpbGQtd2Via2l0IiksICItLWNocm9taXVtIiwgIi0t dXBkYXRlLWNocm9taXVtIl0pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9y dC5idWlsZF93ZWJraXRfY29tbWFuZChidWlsZF9zdHlsZT0iZGVidWciKSwgW1dlYktpdFBvcnQu c2NyaXB0X3BhdGgoImJ1aWxkLXdlYmtpdCIpLCAiLS1kZWJ1ZyIsICItLWNocm9taXVtIiwgIi0t dXBkYXRlLWNocm9taXVtIl0pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKENocm9taXVtUG9y dC51cGRhdGVfd2Via2l0X2NvbW1hbmQoKSwgW1dlYktpdFBvcnQuc2NyaXB0X3BhdGgoInVwZGF0 ZS13ZWJraXQiKSwgIi0tY2hyb21pdW0iXSkKIAogICAgIGRlZiB0ZXN0X2Nocm9taXVtX3h2ZmJf cG9ydChzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1YVkZCUG9ydC5y dW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwgWyJ4dmZiLXJ1biIsICJXZWJLaXRUb29scy9TY3Jp cHRzL25ldy1ydW4td2Via2l0LXRlc3RzIiwgIi0tY2hyb21pdW0iLCAiLS11c2UtZHJ0IiwgIi0t bm8tcGl4ZWwtdGVzdHMiXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoQ2hyb21pdW1YVkZC UG9ydC5ydW5fd2Via2l0X3Rlc3RzX2NvbW1hbmQoKSwgWyJ4dmZiLXJ1biIsICJXZWJLaXRUb29s cy9TY3JpcHRzL25ldy1ydW4td2Via2l0LXRlc3RzIiwgIi0tY2hyb21pdW0iLCAiLS1uby1waXhl bC10ZXN0cyJdKQogCiBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAgIHVuaXR0ZXN0Lm1h aW4oKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggNDUyMzcwMDMzMTUyNDU2M2JlODRjN2ZhODQ1 Y2M1YzBlOWFhZWZlMi4uNjQ4YjJjOWUyNzdhYjEwMzFjOTJjMmQ2OTQ0MmFlODIxN2EwYTJmMyAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC9jaHJvbWl1bS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC0xNzUsOSArMTc1LDkgQEAgY2xhc3MgQ2hyb21pdW1Q b3J0KGJhc2UuUG9ydCk6CiAgICAgICAgIHJldHVybiByZXN1bHQKIAogICAgIGRlZiBkcml2ZXJf bmFtZShzZWxmKToKLSAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy51c2VfZHJ0OgotICAgICAgICAg ICAgcmV0dXJuICJEdW1wUmVuZGVyVHJlZSIKLSAgICAgICAgcmV0dXJuICJ0ZXN0X3NoZWxsIgor ICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnVzZV90ZXN0X3NoZWxsOgorICAgICAgICAgICAgcmV0 dXJuICJ0ZXN0X3NoZWxsIgorICAgICAgICByZXR1cm4gIkR1bXBSZW5kZXJUcmVlIgogCiAgICAg ZGVmIHBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKHNlbGYsICpjb21wcyk6CiAgICAgICAgICIiIlJl dHVybnMgdGhlIGZ1bGwgcGF0aCB0byBwYXRoIG1hZGUgYnkgam9pbmluZyB0aGUgdG9wIG9mIHRo ZQpAQCAtMjE2LDcgKzIxNiw3IEBAIGNsYXNzIENocm9taXVtUG9ydChiYXNlLlBvcnQpOgogCiAg ICAgZGVmIGNyZWF0ZV9kcml2ZXIoc2VsZiwgd29ya2VyX251bWJlcik6CiAgICAgICAgICIiIlN0 YXJ0cyBhIG5ldyBEcml2ZXIgYW5kIHJldHVybnMgYSBoYW5kbGUgdG8gaXQuIiIiCi0gICAgICAg IGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX2RydCcpIGFuZCBzeXMucGxhdGZvcm0gPT0gJ2Rhcndp bic6CisgICAgICAgIGlmIG5vdCBzZWxmLmdldF9vcHRpb24oJ3VzZV90ZXN0X3NoZWxsJykgYW5k IHN5cy5wbGF0Zm9ybSA9PSAnZGFyd2luJzoKICAgICAgICAgICAgIHJldHVybiB3ZWJraXQuV2Vi S2l0RHJpdmVyKHNlbGYsIHdvcmtlcl9udW1iZXIpCiAgICAgICAgIHJldHVybiBDaHJvbWl1bURy aXZlcihzZWxmLCB3b3JrZXJfbnVtYmVyKQogCkBAIC0yNTMsMTYgKzI1Myw2IEBAIGNsYXNzIENo cm9taXVtUG9ydChiYXNlLlBvcnQpOgogICAgICAgICAgICAgcmV0dXJuIGZpbGUucmVhZCgpCiAK ICAgICBkZWYgdGVzdF9leHBlY3RhdGlvbnNfb3ZlcnJpZGVzKHNlbGYpOgotICAgICAgICAjIEZJ WE1FOiBUaGlzIGRydF9vdmVycmlkZXMgaGFuZGxpbmcgc2hvdWxkIGJlIHJlbW92ZWQgd2hlbiB3 ZSBzd2l0Y2gKLSAgICAgICAgIyBmcm9tIHRlc19zaGVsbCB0byBEUlQuCi0gICAgICAgIGRydF9v dmVycmlkZXMgPSAnJwotICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3VzZV9kcnQnKToKLSAg ICAgICAgICAgIGRydF9vdmVycmlkZXNfcGF0aCA9IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9iYXNl KCdMYXlvdXRUZXN0cycsCi0gICAgICAgICAgICAgICAgJ3BsYXRmb3JtJywgJ2Nocm9taXVtJywg J2RydF9leHBlY3RhdGlvbnMudHh0JykKLSAgICAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKGRy dF9vdmVycmlkZXNfcGF0aCk6Ci0gICAgICAgICAgICAgICAgd2l0aCBjb2RlY3Mub3BlbihkcnRf b3ZlcnJpZGVzX3BhdGgsICJyIiwgInV0Zi04IikgYXMgZmlsZToKLSAgICAgICAgICAgICAgICAg ICAgZHJ0X292ZXJyaWRlcyA9IGZpbGUucmVhZCgpCi0KICAgICAgICAgdHJ5OgogICAgICAgICAg ICAgb3ZlcnJpZGVzX3BhdGggPSBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCd3ZWJraXQn LCAndG9vbHMnLAogICAgICAgICAgICAgICAgICdsYXlvdXRfdGVzdHMnLCAndGVzdF9leHBlY3Rh dGlvbnMudHh0JykKQEAgLTI3MSw3ICsyNjEsNyBAQCBjbGFzcyBDaHJvbWl1bVBvcnQoYmFzZS5Q b3J0KToKICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3RzKG92ZXJyaWRlc19wYXRoKToKICAg ICAgICAgICAgIHJldHVybiBOb25lCiAgICAgICAgIHdpdGggY29kZWNzLm9wZW4ob3ZlcnJpZGVz X3BhdGgsICJyIiwgInV0Zi04IikgYXMgZmlsZToKLSAgICAgICAgICAgIHJldHVybiBmaWxlLnJl YWQoKSArIGRydF9vdmVycmlkZXMKKyAgICAgICAgICAgIHJldHVybiBmaWxlLnJlYWQoKQogCiAg ICAgZGVmIHNraXBwZWRfbGF5b3V0X3Rlc3RzKHNlbGYsIGV4dHJhX3Rlc3RfZmlsZXM9Tm9uZSk6 CiAgICAgICAgIGV4cGVjdGF0aW9uc19zdHIgPSBzZWxmLnRlc3RfZXhwZWN0YXRpb25zKCkKQEAg LTM1MCw5ICszNDAsOSBAQCBjbGFzcyBDaHJvbWl1bVBvcnQoYmFzZS5Qb3J0KToKICAgICAgICAg cmV0dXJuIHBhdGgKIAogICAgIGRlZiBfcGF0aF90b19pbWFnZV9kaWZmKHNlbGYpOgotICAgICAg ICBiaW5hcnlfbmFtZSA9ICdpbWFnZV9kaWZmJwotICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24o J3VzZV9kcnQnKToKLSAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0ltYWdlRGlmZicKKyAgICAg ICAgYmluYXJ5X25hbWUgPSAnSW1hZ2VEaWZmJworICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24o J3VzZV90ZXN0X3NoZWxsJyk6CisgICAgICAgICAgICBiaW5hcnlfbmFtZSA9ICdpbWFnZV9kaWZm JwogICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxmLmdldF9vcHRpb24oJ2NvbmZp Z3VyYXRpb24nKSwgYmluYXJ5X25hbWUpCiAKIApAQCAtMzc2LDEwICszNjYsMTAgQEAgY2xhc3Mg Q2hyb21pdW1Ecml2ZXIoYmFzZS5Ecml2ZXIpOgogICAgICAgICAgICAgY21kLmFwcGVuZCgiLS1w aXhlbC10ZXN0cz0iICsKICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fcG9ydC5fY29udmVy dF9wYXRoKHNlbGYuX2ltYWdlX3BhdGgpKQogCi0gICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29w dGlvbigndXNlX2RydCcpOgotICAgICAgICAgICAgY21kLmFwcGVuZCgnLS10ZXN0LXNoZWxsJykK LSAgICAgICAgZWxzZToKKyAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCd1c2VfdGVz dF9zaGVsbCcpOgogICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1sYXlvdXQtdGVzdHMnKQorICAg ICAgICBlbHNlOgorICAgICAgICAgICAgY21kLmFwcGVuZCgnLS10ZXN0LXNoZWxsJykKIAogICAg ICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ3N0YXJ0dXBfZGlhbG9nJyk6CiAgICAgICAg ICAgICBjbWQuYXBwZW5kKCctLXRlc3RzaGVsbC1zdGFydHVwLWRpYWxvZycpCkBAIC0zOTMsMTEg KzM4MywxMiBAQCBjbGFzcyBDaHJvbWl1bURyaXZlcihiYXNlLkRyaXZlcik6CiAgICAgICAgIGlm IHNlbGYuX3BvcnQuZ2V0X29wdGlvbignbXVsdGlwbGVfbG9hZHMnKSA+IDA6CiAgICAgICAgICAg ICBjbWQuYXBwZW5kKCctLW11bHRpcGxlLWxvYWRzPScgKyBzdHIoc2VsZi5fcG9ydC5nZXRfb3B0 aW9uKCdtdWx0aXBsZV9sb2FkcycpKSkKIAotICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRp b24oJ2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nJyk6Ci0gICAgICAgICAgICBjbWQuYXBwZW5kKCct LWVuYWJsZS1hY2NlbGVyYXRlZC1jb21wb3NpdGluZycpCi0KLSAgICAgICAgaWYgc2VsZi5fcG9y dC5nZXRfb3B0aW9uKCdhY2NlbGVyYXRlZF8yZF9jYW52YXMnKToKLSAgICAgICAgICAgIGNtZC5h cHBlbmQoJy0tZW5hYmxlLWFjY2VsZXJhdGVkLTJkLWNhbnZhcycpCisgICAgICAgICMgdGVzdF9z aGVsbCBkb2VzIG5vdCBzdXBwb3J0IGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5nLgorICAgICAgICBp ZiBub3Qgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCJ1c2VfdGVzdF9zaGVsbCIpOgorICAgICAgICAg ICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdhY2NlbGVyYXRlZF9jb21wb3NpdGluZycpOgor ICAgICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tZW5hYmxlLWFjY2VsZXJhdGVkLWNvbXBvc2l0 aW5nJykKKyAgICAgICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignYWNjZWxlcmF0ZWRf MmRfY2FudmFzJyk6CisgICAgICAgICAgICAgICAgY21kLmFwcGVuZCgnLS1lbmFibGUtYWNjZWxl cmF0ZWQtMmQtY2FudmFzJykKICAgICAgICAgcmV0dXJuIGNtZAogCiAgICAgZGVmIHN0YXJ0KHNl bGYpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC9jaHJvbWl1bV9ncHUucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQppbmRleCA1NGEwZmVlM2U2YWRmMDVhNjg0 YjllNTMyZDFlNmExNzAzYWVhYjViLi5jMWY1YzhkNjljN2E0MGRjM2Y0OWZlOTY3MTZmMjA0MjUw ZDExNTg2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2dwdS5weQpAQCAtNjksOCArNjksNiBAQCBk ZWYgX3NldF9ncHVfb3B0aW9ucyhvcHRpb25zKToKICAgICAgICAgICAgIG9wdGlvbnMuYWNjZWxl cmF0ZWRfY29tcG9zaXRpbmcgPSBUcnVlCiAgICAgICAgIGlmIG9wdGlvbnMuYWNjZWxlcmF0ZWRf MmRfY2FudmFzIGlzIE5vbmU6CiAgICAgICAgICAgICBvcHRpb25zLmFjY2VsZXJhdGVkXzJkX2Nh bnZhcyA9IFRydWUKLSAgICAgICAgaWYgb3B0aW9ucy51c2VfZHJ0IGlzIE5vbmU6Ci0gICAgICAg ICAgICBvcHRpb25zLnVzZV9kcnQgPSBUcnVlCiAKICAgICAgICAgIyBGSVhNRTogUmVtb3ZlIHRo aXMgYWZ0ZXIgaHR0cDovL2NvZGVyZXZpZXcuY2hyb21pdW0ub3JnLzUxMzMwMDEvIGlzIGVuYWJs ZWQKICAgICAgICAgIyBvbiB0aGUgYm90cy4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fZ3B1X3VuaXR0ZXN0LnB5IGIv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9n cHVfdW5pdHRlc3QucHkKaW5kZXggMDNiYzk4YWZiMzQwNzA3YzMzZWYxNjQ5ZmE0OWM0NjAzOTFl NDU5Ny4uYWQwNDA0Y2ZmZTQ3OTBmOWVkZTMxMTMxM2QxZDRkOGZjYTY5MzYwNSAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1 bV9ncHVfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9ncHVfdW5pdHRlc3QucHkKQEAgLTQ2LDEyICs0NiwxMCBA QCBjbGFzcyBDaHJvbWl1bUdwdVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBtb2Nr X29wdGlvbnMgPSBtb2NrdG9vbC5Nb2NrT3B0aW9ucyhhY2NlbGVyYXRlZF9jb21wb3NpdGluZz1O b25lLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhY2NlbGVy YXRlZF8yZF9jYW52YXM9Tm9uZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYnVpbGRlcl9uYW1lPSdmb28nLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICB1c2VfZHJ0PU5vbmUsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNoaWxkX3Byb2Nlc3Nlcz1Ob25lKQogICAgICAgICBwb3J0ID0g Y2hyb21pdW1fZ3B1LmdldChwb3J0X25hbWU9cG9ydF9uYW1lLCBvcHRpb25zPW1vY2tfb3B0aW9u cykKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuX29wdGlvbnMuYWNjZWxlcmF0ZWRfY29t cG9zaXRpbmcpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll9vcHRpb25zLmFjY2VsZXJh dGVkXzJkX2NhbnZhcykKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuX29wdGlvbnMudXNl X2RydCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmRlZmF1bHRfY2hpbGRfcHJvY2Vz c2VzKCksIDEpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5fb3B0aW9ucy5idWlsZGVy X25hbWUsICdmb28gLSBHUFUnKQogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9saW51eC5weQppbmRl eCBiMjZhNmI1NzQxNTczZjJiN2U0MzY5MmI4ZDFiM2E2OTFkOGRlZDA3Li41ZDlkZDg3NGE5ZGZi Y2ZiYjFhMjM5YWEwNGNhYTk0Y2FlMjYwMGE3IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2xpbnV4LnB5CisrKyBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbGlu dXgucHkKQEAgLTgxLDcgKzgxLDcgQEAgY2xhc3MgQ2hyb21pdW1MaW51eFBvcnQoY2hyb21pdW0u Q2hyb21pdW1Qb3J0KToKICAgICAgICAgYmFzZSA9IHNlbGYucGF0aF9mcm9tX2Nocm9taXVtX2Jh c2UoKQogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oYmFzZSwgJ3Njb25z YnVpbGQnKSk6CiAgICAgICAgICAgICByZXR1cm4gb3MucGF0aC5qb2luKGJhc2UsICdzY29uc2J1 aWxkJywgKmNvbXBzKQotICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhvcy5wYXRoLmpvaW4oYmFz ZSwgJ291dCcsICpjb21wcykpIG9yIG5vdCBzZWxmLmdldF9vcHRpb24oJ3VzZV9kcnQnKToKKyAg ICAgICAgaWYgb3MucGF0aC5leGlzdHMob3MucGF0aC5qb2luKGJhc2UsICdvdXQnLCAqY29tcHMp KSBvciBzZWxmLmdldF9vcHRpb24oJ3VzZV90ZXN0X3NoZWxsJyk6CiAgICAgICAgICAgICByZXR1 cm4gb3MucGF0aC5qb2luKGJhc2UsICdvdXQnLCAqY29tcHMpCiAgICAgICAgIGJhc2UgPSBzZWxm LnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpCiAgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBh dGguam9pbihiYXNlLCAnc2NvbnNidWlsZCcpKToKQEAgLTE0OCw5ICsxNDgsOSBAQCBjbGFzcyBD aHJvbWl1bUxpbnV4UG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAgIGRlZiBfcGF0aF90 b19kcml2ZXIoc2VsZiwgY29uZmlndXJhdGlvbj1Ob25lKToKICAgICAgICAgaWYgbm90IGNvbmZp Z3VyYXRpb246CiAgICAgICAgICAgICBjb25maWd1cmF0aW9uID0gc2VsZi5nZXRfb3B0aW9uKCdj b25maWd1cmF0aW9uJykKLSAgICAgICAgYmluYXJ5X25hbWUgPSAndGVzdF9zaGVsbCcKLSAgICAg ICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd1c2VfZHJ0Jyk6Ci0gICAgICAgICAgICBiaW5hcnlfbmFt ZSA9ICdEdW1wUmVuZGVyVHJlZScKKyAgICAgICAgYmluYXJ5X25hbWUgPSAnRHVtcFJlbmRlclRy ZWUnCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX3Rlc3Rfc2hlbGwnKToKKyAgICAg ICAgICAgIGJpbmFyeV9uYW1lID0gJ3Rlc3Rfc2hlbGwnCiAgICAgICAgIHJldHVybiBzZWxmLl9i dWlsZF9wYXRoKGNvbmZpZ3VyYXRpb24sIGJpbmFyeV9uYW1lKQogCiAgICAgZGVmIF9wYXRoX3Rv X2hlbHBlcihzZWxmKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fbWFjLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKaW5kZXggYjAyM2M5NDFj ZWFkZWZjYzQ0MDU0YjhlMjI0ZjU5ZTM0ZjFkYjg0YS4uZjYzOGUwMTNjNjE5MjdhYmNhOGY2ZmVj NDNkZDYxYzllNDI3MjhiMCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9tYWMucHkKQEAgLTc5LDkg Kzc5LDkgQEAgY2xhc3MgQ2hyb21pdW1NYWNQb3J0KGNocm9taXVtLkNocm9taXVtUG9ydCk6CiAK ICAgICBkZWYgZHJpdmVyX25hbWUoc2VsZik6CiAgICAgICAgICIiIm5hbWUgZm9yIHRoaXMgcG9y dCdzIGVxdWl2YWxlbnQgb2YgRHVtcFJlbmRlclRyZWUuIiIiCi0gICAgICAgIGlmIHNlbGYuZ2V0 X29wdGlvbigndXNlX2RydCcpOgotICAgICAgICAgICAgcmV0dXJuICJEdW1wUmVuZGVyVHJlZSIK LSAgICAgICAgcmV0dXJuICJUZXN0U2hlbGwiCisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbign dXNlX3Rlc3Rfc2hlbGwnKToKKyAgICAgICAgICAgIHJldHVybiAiVGVzdFNoZWxsIgorICAgICAg ICByZXR1cm4gIkR1bXBSZW5kZXJUcmVlIgogCiAgICAgZGVmIHRlc3RfcGxhdGZvcm1fbmFtZShz ZWxmKToKICAgICAgICAgIyBXZSB1c2UgJ21hYycgaW5zdGVhZCBvZiAnY2hyb21pdW0tbWFjJwpA QCAtMTA2LDcgKzEwNiw3IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1bS5DaHJvbWl1 bVBvcnQpOgogCiAgICAgZGVmIF9idWlsZF9wYXRoKHNlbGYsICpjb21wcyk6CiAgICAgICAgIHBh dGggPSBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNlKCd4Y29kZWJ1aWxkJywgKmNvbXBzKQot ICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhwYXRoKSBvciBub3Qgc2VsZi5nZXRfb3B0aW9uKCd1 c2VfZHJ0Jyk6CisgICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHBhdGgpIG9yIHNlbGYuZ2V0X29w dGlvbigndXNlX3Rlc3Rfc2hlbGwnKToKICAgICAgICAgICAgIHJldHVybiBwYXRoCiAgICAgICAg IHJldHVybiBzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFzZSgnV2ViS2l0JywgJ2Nocm9taXVtJywg J3hjb2RlYnVpbGQnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KmNvbXBzKQpAQCAtMTQ5LDkgKzE0OSw5IEBAIGNsYXNzIENocm9taXVtTWFjUG9ydChjaHJvbWl1 bS5DaHJvbWl1bVBvcnQpOgogICAgICAgICAgICAgJ0NvbnRlbnRzJywgJ01hY09TJywgc2VsZi5k cml2ZXJfbmFtZSgpKQogCiAgICAgZGVmIF9wYXRoX3RvX2hlbHBlcihzZWxmKToKLSAgICAgICAg YmluYXJ5X25hbWUgPSAnbGF5b3V0X3Rlc3RfaGVscGVyJwotICAgICAgICBpZiBzZWxmLmdldF9v cHRpb24oJ3VzZV9kcnQnKToKLSAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0xheW91dFRlc3RI ZWxwZXInCisgICAgICAgIGJpbmFyeV9uYW1lID0gJ0xheW91dFRlc3RIZWxwZXInCisgICAgICAg IGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX3Rlc3Rfc2hlbGwnKToKKyAgICAgICAgICAgIGJpbmFy eV9uYW1lID0gJ2xheW91dF90ZXN0X2hlbHBlcicKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxk X3BhdGgoc2VsZi5nZXRfb3B0aW9uKCdjb25maWd1cmF0aW9uJyksIGJpbmFyeV9uYW1lKQogCiAg ICAgZGVmIF9wYXRoX3RvX3dkaWZmKHNlbGYpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5p dHRlc3QucHkKaW5kZXggNTM5NjUyMjBmZjJhM2FkOTQwZDFmYzE5MDMyYTNjYTljMDg5NGY1YS4u Yzg3OTg0ZmNkMWJjZmY4OGQ1ZDM3ZjVjZjFiYWY0YzI3NGMyY2M3NCAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0 dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5CkBAIC0xMDUsMTggKzEwNSwyNSBAQCBjbGFzcyBDaHJv bWl1bVBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgIHJldHVybiAnZGVm YXVsdCcKIAogICAgIGRlZiB0ZXN0X3BhdGhfdG9faW1hZ2VfZGlmZihzZWxmKToKLSAgICAgICAg bW9ja19vcHRpb25zID0gbW9ja3Rvb2wuTW9ja09wdGlvbnModXNlX2RydD1UcnVlKQorICAgICAg ICBtb2NrX29wdGlvbnMgPSBtb2NrdG9vbC5Nb2NrT3B0aW9ucygpCiAgICAgICAgIHBvcnQgPSBD aHJvbWl1bVBvcnRUZXN0LlRlc3RMaW51eFBvcnQob3B0aW9ucz1tb2NrX29wdGlvbnMpCiAgICAg ICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYoKS5lbmRzd2l0aCgK ICAgICAgICAgICAgICcvb3V0L2RlZmF1bHQvSW1hZ2VEaWZmJyksIG1zZz1wb3J0Ll9wYXRoX3Rv X2ltYWdlX2RpZmYoKSkKICAgICAgICAgcG9ydCA9IENocm9taXVtUG9ydFRlc3QuVGVzdE1hY1Bv cnQob3B0aW9ucz1tb2NrX29wdGlvbnMpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0Ll9w YXRoX3RvX2ltYWdlX2RpZmYoKS5lbmRzd2l0aCgKICAgICAgICAgICAgICcveGNvZGVidWlsZC9k ZWZhdWx0L0ltYWdlRGlmZicpKQorICAgICAgICBtb2NrX29wdGlvbnMgPSBtb2NrdG9vbC5Nb2Nr T3B0aW9ucyh1c2VfdGVzdF9zaGVsbD1UcnVlKQorICAgICAgICBwb3J0ID0gQ2hyb21pdW1Qb3J0 VGVzdC5UZXN0TGludXhQb3J0KG9wdGlvbnM9bW9ja19vcHRpb25zKQorICAgICAgICBzZWxmLmFz c2VydFRydWUocG9ydC5fcGF0aF90b19pbWFnZV9kaWZmKCkuZW5kc3dpdGgoCisgICAgICAgICAg ICAnL291dC9kZWZhdWx0L2ltYWdlX2RpZmYnKSwgbXNnPXBvcnQuX3BhdGhfdG9faW1hZ2VfZGlm ZigpKQorICAgICAgICBwb3J0ID0gQ2hyb21pdW1Qb3J0VGVzdC5UZXN0TWFjUG9ydChvcHRpb25z PW1vY2tfb3B0aW9ucykKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQuX3BhdGhfdG9faW1h Z2VfZGlmZigpLmVuZHN3aXRoKAorICAgICAgICAgICAgJy94Y29kZWJ1aWxkL2RlZmF1bHQvaW1h Z2VfZGlmZicpKQogICAgICAgICAjIEZJWE1FOiBGaWd1cmUgb3V0IGhvdyB0aGlzIGlzIGdvaW5n IHRvIHdvcmsgb24gV2luZG93cy4KICAgICAgICAgI3BvcnQgPSBjaHJvbWl1bV93aW4uQ2hyb21p dW1XaW5Qb3J0KCd0ZXN0LXBvcnQnLCBvcHRpb25zPU1vY2tPcHRpb25zKCkpCiAKICAgICBkZWYg dGVzdF9za2lwcGVkX2xheW91dF90ZXN0cyhzZWxmKToKLSAgICAgICAgbW9ja19vcHRpb25zID0g bW9ja3Rvb2wuTW9ja09wdGlvbnModXNlX2RydD1UcnVlKQorICAgICAgICBtb2NrX29wdGlvbnMg PSBtb2NrdG9vbC5Nb2NrT3B0aW9ucygpCiAgICAgICAgIHBvcnQgPSBDaHJvbWl1bVBvcnRUZXN0 LlRlc3RMaW51eFBvcnQob3B0aW9ucz1tb2NrX29wdGlvbnMpCiAKICAgICAgICAgZmFrZV90ZXN0 ID0gb3MucGF0aC5qb2luKHBvcnQubGF5b3V0X3Rlc3RzX2RpcigpLCAiZmFzdC9qcy9ub3QtZ29v ZC5qcyIpCkBAIC0xNjIsNyArMTY5LDcgQEAgTElOVVggV0lOIDogZmFzdC9qcy92ZXJ5LWdvb2Qu anMgPSBUSU1FT1VUIFBBU1MiIiIKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3Jl c3VsdAogICAgICAgICAgICAgICAgIHJldHVybiAnJwogCi0gICAgICAgIG1vY2tfb3B0aW9ucyA9 IG1vY2t0b29sLk1vY2tPcHRpb25zKHVzZV9kcnQ9RmFsc2UpCisgICAgICAgIG1vY2tfb3B0aW9u cyA9IG1vY2t0b29sLk1vY2tPcHRpb25zKCkKICAgICAgICAgcG9ydCA9IENocm9taXVtUG9ydFRl c3QuVGVzdExpbnV4UG9ydChtb2NrX29wdGlvbnMpCiAKICAgICAgICAgIyBJbWFnZXMgYXJlIGRp ZmZlcmVudC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fd2luLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKaW5kZXggNjliNTI5YWUxYjQzYWI0 ZWQ2NjNlMGY2ZWI0MTY1N2VhNmZiNzQ1OC4uZDA4MGY4MjRkMDEzZDE1NTY3MTMzM2Y4MjZjMjcz YzQ4NDRkMTZkOSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV93aW4ucHkKQEAgLTEwNSwxMyArMTA1 LDEyIEBAIGNsYXNzIENocm9taXVtV2luUG9ydChjaHJvbWl1bS5DaHJvbWl1bVBvcnQpOgogICAg ICMKICAgICAjIFBST1RFQ1RFRCBST1VUSU5FUwogICAgICMKLQogICAgIGRlZiBfYnVpbGRfcGF0 aChzZWxmLCAqY29tcHMpOgogICAgICAgICBwID0gc2VsZi5wYXRoX2Zyb21fY2hyb21pdW1fYmFz ZSgnd2Via2l0JywgKmNvbXBzKQogICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhwKToKICAgICAg ICAgICAgIHJldHVybiBwCiAgICAgICAgIHAgPSBzZWxmLnBhdGhfZnJvbV9jaHJvbWl1bV9iYXNl KCdjaHJvbWUnLCAqY29tcHMpCi0gICAgICAgIGlmIG9zLnBhdGguZXhpc3RzKHApIG9yIG5vdCBz ZWxmLmdldF9vcHRpb24oJ3VzZV9kcnQnKToKKyAgICAgICAgaWYgb3MucGF0aC5leGlzdHMocCkg b3Igc2VsZi5nZXRfb3B0aW9uKCd1c2VfdGVzdF9zaGVsbCcpOgogICAgICAgICAgICAgcmV0dXJu IHAKICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbihzZWxmLnBhdGhfZnJvbV93ZWJraXRfYmFz ZSgpLCAnV2ViS2l0JywgJ2Nocm9taXVtJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAq Y29tcHMpCkBAIC0xNDAsMjEgKzEzOSwyMSBAQCBjbGFzcyBDaHJvbWl1bVdpblBvcnQoY2hyb21p dW0uQ2hyb21pdW1Qb3J0KToKICAgICBkZWYgX3BhdGhfdG9fZHJpdmVyKHNlbGYsIGNvbmZpZ3Vy YXRpb249Tm9uZSk6CiAgICAgICAgIGlmIG5vdCBjb25maWd1cmF0aW9uOgogICAgICAgICAgICAg Y29uZmlndXJhdGlvbiA9IHNlbGYuZ2V0X29wdGlvbignY29uZmlndXJhdGlvbicpCi0gICAgICAg IGJpbmFyeV9uYW1lID0gJ3Rlc3Rfc2hlbGwuZXhlJwotICAgICAgICBpZiBzZWxmLmdldF9vcHRp b24oJ3VzZV9kcnQnKToKLSAgICAgICAgICAgIGJpbmFyeV9uYW1lID0gJ0R1bXBSZW5kZXJUcmVl LmV4ZScKKyAgICAgICAgYmluYXJ5X25hbWUgPSAnRHVtcFJlbmRlclRyZWUuZXhlJworICAgICAg ICBpZiBzZWxmLmdldF9vcHRpb24oJ3VzZV90ZXN0X3NoZWxsJyk6CisgICAgICAgICAgICBiaW5h cnlfbmFtZSA9ICd0ZXN0X3NoZWxsLmV4ZScKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3Bh dGgoY29uZmlndXJhdGlvbiwgYmluYXJ5X25hbWUpCiAKICAgICBkZWYgX3BhdGhfdG9faGVscGVy KHNlbGYpOgotICAgICAgICBiaW5hcnlfbmFtZSA9ICdsYXlvdXRfdGVzdF9oZWxwZXIuZXhlJwot ICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3VzZV9kcnQnKToKLSAgICAgICAgICAgIGJpbmFy eV9uYW1lID0gJ0xheW91dFRlc3RIZWxwZXIuZXhlJworICAgICAgICBiaW5hcnlfbmFtZSA9ICdM YXlvdXRUZXN0SGVscGVyLmV4ZScKKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd1c2VfdGVz dF9zaGVsbCcpOgorICAgICAgICAgICAgYmluYXJ5X25hbWUgPSAnbGF5b3V0X3Rlc3RfaGVscGVy LmV4ZScKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoc2VsZi5nZXRfb3B0aW9uKCdj b25maWd1cmF0aW9uJyksIGJpbmFyeV9uYW1lKQogCiAgICAgZGVmIF9wYXRoX3RvX2ltYWdlX2Rp ZmYoc2VsZik6Ci0gICAgICAgIGJpbmFyeV9uYW1lID0gJ2ltYWdlX2RpZmYuZXhlJwotICAgICAg ICBpZiBzZWxmLmdldF9vcHRpb24oJ3VzZV9kcnQnKToKLSAgICAgICAgICAgIGJpbmFyeV9uYW1l ID0gJ0ltYWdlRGlmZi5leGUnCisgICAgICAgIGJpbmFyeV9uYW1lID0gJ0ltYWdlRGlmZi5leGUn CisgICAgICAgIGlmIHNlbGYuZ2V0X29wdGlvbigndXNlX3Rlc3Rfc2hlbGwnKToKKyAgICAgICAg ICAgIGJpbmFyeV9uYW1lID0gJ2ltYWdlX2RpZmYuZXhlJwogICAgICAgICByZXR1cm4gc2VsZi5f YnVpbGRfcGF0aChzZWxmLmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwgYmluYXJ5X25hbWUp CiAKICAgICBkZWYgX3BhdGhfdG9fd2RpZmYoc2VsZik6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IDA5 YmU4MzNkNzUyZjAyZmRiNzk0NDY2M2I5MGU1NWVhNzMwY2UxYTEuLmFmZGViZWIyYzg0NmVkN2Nj ZGZkMmZmZTdkYjAyMWFkMzE1MjEzYjkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CisrKyBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC00MDEsMTMgKzQw MSw2IEBAIGNsYXNzIFdlYktpdERyaXZlcihiYXNlLkRyaXZlcik6CiAgICAgICAgIGlmIHNlbGYu X3BvcnQuZ2V0X29wdGlvbigncGl4ZWxfdGVzdHMnKToKICAgICAgICAgICAgIGNtZC5hcHBlbmQo Jy0tcGl4ZWwtdGVzdHMnKQogCi0gICAgICAgIGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbigndXNl X2RydCcpOgotICAgICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdhY2NlbGVyYXRl ZF9jb21wb3NpdGluZycpOgotICAgICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tZW5hYmxlLWFj Y2VsZXJhdGVkLWNvbXBvc2l0aW5nJykKLQotICAgICAgICAgICAgaWYgc2VsZi5fcG9ydC5nZXRf b3B0aW9uKCdhY2NlbGVyYXRlZF8yZF9jYW52YXMnKToKLSAgICAgICAgICAgICAgICBjbWQuYXBw ZW5kKCctLWVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMnKQotCiAgICAgICAgIHJldHVybiBj bWQKIAogICAgIGRlZiBzdGFydChzZWxmKToKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4 IGJhNTVmMTY5OTFmNDYyMDYwZGQxN2VjMTNjMzRmMzljYTUxYmYxY2UuLjUxYWRmNjdmY2EyOWQ5 YWIzMTA5MzE5NjUwN2VkYzM3NmZkMmE1ODAgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpA QCAtMTQzOCw5ICsxNDM4LDkgQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25lKToKICAgICAgICAg b3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbm9jaGVjay1zeXMtZGVwcyIsIGFjdGlvbj0ic3RvcmVf dHJ1ZSIsCiAgICAgICAgICAgICBkZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgaGVscD0iRG9u J3QgY2hlY2sgdGhlIHN5c3RlbSBkZXBlbmRlbmNpZXMgKHRoZW1lcykiKSwKLSAgICAgICAgb3B0 cGFyc2UubWFrZV9vcHRpb24oIi0tdXNlLWRydCIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCi0gICAg ICAgICAgICBkZWZhdWx0PVRydWUsCi0gICAgICAgICAgICBoZWxwPSIoREVQUkVDQVRFRCkiKSwK KyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tdXNlLXRlc3Qtc2hlbGwiLCBhY3Rpb249 InN0b3JlX3RydWUiLAorICAgICAgICAgICAgZGVmYXVsdD1GYWxzZSwKKyAgICAgICAgICAgIGhl bHA9IlVzZSB0ZXN0X3NoZWxsIGluc3RlYWQgb2YgRFJUIiksCiAgICAgICAgIG9wdHBhcnNlLm1h a2Vfb3B0aW9uKCItLWFjY2VsZXJhdGVkLWNvbXBvc2l0aW5nIiwKICAgICAgICAgICAgIGFjdGlv bj0ic3RvcmVfdHJ1ZSIsCiAgICAgICAgICAgICBoZWxwPSJVc2UgaGFyZHdhcmUtYWNjZWxhdGVk IGNvbXBvc2l0aW5nIGZvciByZW5kZXJpbmciKSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkgYi9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25z LnB5CmluZGV4IDJmMTA1N2FjMmZiNTAyYjdkYjBhM2YzYzE0YWRmYTgzN2Q2NGZhMjYuLmM4NmIz MmNlNTY1NzI0NWRmN2QzZjI4MDkzNjkzMzU5ZTU5ODZiYTUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4 cGVjdGF0aW9ucy5weQpAQCAtNDgsNyArNDgsNiBAQCBjbGFzcyBDaHJvbWl1bU9wdGlvbnMob2Jq ZWN0KToKICAgICAiIiIKICAgICBkZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgIHNlbGYuY2hy b21pdW0gPSBUcnVlCi0gICAgICAgIHNlbGYudXNlX2RydCA9IFRydWUKIAogCiBjbGFzcyBUZXN0 RXhwZWN0YXRpb25zQ2hlY2tlcihvYmplY3QpOgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkgYi9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQppbmRleCAxNmRkYzJjODM3ZTEy NmNlZjBkMTQ1Mjk5N2JiYzM0ZDA4OTRiMDMzLi5mMDRmMzg0MDhlZWMwZDFlNGNlNjVkZTNiMjdj MTFlMjg4OTdiZTQxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcXVlcmllcy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQpAQCAtMzc2LDEyICszNzYsOCBAQCBvdXQgd2hhdCBw b3J0cyBhcmUgc2tpcHBpbmcgdGhlIHRlc3QocykuIENhdGVnb3JpZXMgYXJlIHRha2VuIGluIGFj Y291bnQgdG9vLiIiIgogICAgIGFyZ3VtZW50X25hbWVzID0gIlRFU1RfTkFNRSIKIAogICAgIGRl ZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgotICAgICAgICBjbGFzcyBPcHRp b25zOgotICAgICAgICAgICAgIyBSZXF1aXJlZCBmb3IgY2hyb21pdW0gcG9ydC4KLSAgICAgICAg ICAgIHVzZV9kcnQgPSBUcnVlCi0KICAgICAgICAgcmVzdWx0cyA9IGRpY3QoWyh0ZXN0X25hbWUs IFtdKSBmb3IgdGVzdF9uYW1lIGluIGFyZ3NdKQotICAgICAgICBmb3IgcG9ydF9uYW1lLCBwb3J0 X29iamVjdCBpbiB0b29sLnBvcnRfZmFjdG9yeS5nZXRfYWxsKG9wdGlvbnM9T3B0aW9ucykuaXRl cml0ZW1zKCk6CisgICAgICAgIGZvciBwb3J0X25hbWUsIHBvcnRfb2JqZWN0IGluIHRvb2wucG9y dF9mYWN0b3J5LmdldF9hbGwoKS5pdGVyaXRlbXMoKToKICAgICAgICAgICAgIGZvciB0ZXN0X25h bWUgaW4gYXJnczoKICAgICAgICAgICAgICAgICBpZiBwb3J0X29iamVjdC5za2lwc19sYXlvdXRf dGVzdCh0ZXN0X25hbWUpOgogICAgICAgICAgICAgICAgICAgICByZXN1bHRzW3Rlc3RfbmFtZV0u YXBwZW5kKHBvcnRfbmFtZSkK