86242 2012-05-11 12:34:39 -0700 garden-o-matic should specify which types of baselines to rebaseline 2012-05-14 13:10:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84762 1 dpranke dpranke abarth dglazkov eric ojan oldest_to_newest 621877 0 dpranke 2012-05-11 12:34:39 -0700 garden-o-matic should specify which types of baselines to rebaseline 621885 1 141474 dpranke 2012-05-11 12:37:31 -0700 Created attachment 141474 Patch 621887 2 dpranke 2012-05-11 12:38:29 -0700 Okay, I think this roughly does what we want, but I don't really know this code and my javascript coding ability is, shall we say, weak. So, feedback is encouraged. 621888 3 141474 dpranke 2012-05-11 12:39:00 -0700 Comment on attachment 141474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141474&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js:106 > + // FIXME: Do we need to handle lists with multiple failure types? This part in particular I'm not sure about? 621927 4 141474 abarth 2012-05-11 13:29:11 -0700 Comment on attachment 141474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141474&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js:83 > + 'suffixes': suffixes, Do we need to suffixes.join(',') here too? >> Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js:106 >> + // FIXME: Do we need to handle lists with multiple failure types? > > This part in particular I'm not sure about? Yeah, we need to handle multiple failure types. By the way, this file should have some associated unit tests in checkout_unittests.js. You can run them your browser by opening run_unittests.html. It should be easy to test this change. > Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js:107 > + var suffixes = results.failureTypeToExtensionList(failureInfo.failureTypeList[0]); I think what you want to do is something like the following: base.uniquifyArray(base.flattenArray(failureInfo.failureTypeList.map(results.failureTypeToExtensionList))) 621929 5 abarth 2012-05-11 13:29:56 -0700 Generally looks good. I think the main thing is you just need to update the unittests to test the new behavior. 621937 6 141474 ojan 2012-05-11 13:37:13 -0700 Comment on attachment 141474 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141474&action=review LGTM as well with more tests. > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:182 > + self._baseline_suffix_list = options.suffixes.split(',') Dead code. > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:211 > + self._baseline_suffix_list = options.suffixes.split(',') Looks like if you avoid the join in the calling code, you could avoid needing to call split here as well, a la line 183 above. 622048 7 141515 dpranke 2012-05-11 15:44:47 -0700 Created attachment 141515 make js tests work, update w/ review feedback 622052 8 141515 abarth 2012-05-11 15:48:15 -0700 Comment on attachment 141515 make js tests work, update w/ review feedback Looks great. Thanks! 623246 9 dpranke 2012-05-14 13:10:37 -0700 Committed r116988: <http://trac.webkit.org/changeset/116988> 141474 2012-05-11 12:37:31 -0700 2012-05-11 15:44:43 -0700 Patch bug-86242-20120511123730.patch text/plain 13693 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2Nzg3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTMxNTE5OTE4OTViZjNkOGZiODRjMzMwNDdmZjk4ZGUy YmVlMWFlZi4uMzI3M2ZkOTE5OTgwMDNiMDBhNDVkZmUwZGYyMDIyNjUzMjM3YWMzYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQw IEBACiAyMDEyLTA1LTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIGdhcmRlbi1vLW1hdGljIHNob3VsZCBzcGVjaWZ5IHdoaWNoIHR5cGVzIG9mIGJhc2Vs aW5lcyB0byByZWJhc2VsaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NjI0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgY2hhbmdlIG1vZGlmaWVzIGdhcmRlbi1vLW1hdGljIHNvIHRoYXQgd2Ug YXJlIGV4cGxpY2l0CisgICAgICAgIGFib3V0IHdoZXRoZXIgdG8gcmViYXNlbGluZSB0aGUgdGV4 dCBmaWxlLCB0aGUgaW1hZ2UgZmlsZSwgb3IKKyAgICAgICAgYm90aC4gVGhpcyBzaG91bGQgcHJl dmVudCB1cyBmcm9tIHB1bGxpbmcgaW5jb3JyZWN0IG9yCisgICAgICAgIHVuZXhwZWN0ZWQgYmFz ZWxpbmVzIG9mZiB0aGUgYm90cy4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL2NoZWNr b3V0LmpzOgorICAgICAgICAoLik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2Nv bW1hbmRzL3JlYmFzZWxpbmUucHk6CisgICAgICAgIChBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1h bmQpOgorICAgICAgICAoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kLl9faW5pdF9fKToKKyAg ICAgICAgKFJlYmFzZWxpbmVUZXN0KToKKyAgICAgICAgKFJlYmFzZWxpbmVUZXN0Ll9yZWJhc2Vs aW5lX3Rlc3RfYW5kX3VwZGF0ZV9leHBlY3RhdGlvbnMpOgorICAgICAgICAoUmViYXNlbGluZVRl c3QuZXhlY3V0ZSk6CisgICAgICAgIChPcHRpbWl6ZUJhc2VsaW5lcyk6CisgICAgICAgIChPcHRp bWl6ZUJhc2VsaW5lcy5fb3B0aW1pemVfYmFzZWxpbmUpOgorICAgICAgICAoT3B0aW1pemVCYXNl bGluZXMuZXhlY3V0ZSk6CisgICAgICAgIChBbmFseXplQmFzZWxpbmVzKToKKyAgICAgICAgKEFu YWx5emVCYXNlbGluZXMuX2FuYWx5emVfYmFzZWxpbmUpOgorICAgICAgICAoQW5hbHl6ZUJhc2Vs aW5lcy5leGVjdXRlKToKKyAgICAgICAgKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMuX3JlYmFzZWxp bmVfcG9ydCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2FyZGVu aW5nc2VydmVyLnB5OgorICAgICAgICAoR2FyZGVuaW5nSFRUUFJlcXVlc3RIYW5kbGVyLnJlYmFz ZWxpbmUpOgorICAgICAgICAoR2FyZGVuaW5nSFRUUFJlcXVlc3RIYW5kbGVyLm9wdGltaXplYmFz ZWxpbmVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5p bmdzZXJ2ZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChHYXJkZW5pbmdTZXJ2ZXJUZXN0LnRlc3Rf cmViYXNlbGluZSk6CisgICAgICAgIChHYXJkZW5pbmdTZXJ2ZXJUZXN0LnRlc3RfcmViYXNlbGlu ZV9uZXdfcG9ydCk6CisgICAgICAgIChHYXJkZW5pbmdTZXJ2ZXJUZXN0LnRlc3Rfb3B0aW1pemVi YXNlbGluZXMpOgorCisyMDEyLTA1LTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0u b3JnPgorCiAgICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lIHNob3VsZCBmZXRjaCBzdGFs ZSBleHBlY3RhdGlvbnMgOikKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg2MjMxCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1 aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL2No ZWNrb3V0LmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25m aWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY2hlY2tvdXQuanMKaW5kZXggOGUx YmM1ZDRmN2M5NjAxODdhMDk4N2Y1Yjg2ODQ0ZmUzYjBmOGRhZS4uOWEyMTk5MWZiYjU4M2E1YzVl OWU5NmEyODUzYTJiYWVlZWM1MDY0OCAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3Njcmlw dHMvY2hlY2tvdXQuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY2hlY2tvdXQuanMK QEAgLTc1LDExICs3NSwxMiBAQCBjaGVja291dC51cGRhdGVFeHBlY3RhdGlvbnMgPSBmdW5jdGlv bihmYWlsdXJlSW5mb0xpc3QsIGNhbGxiYWNrLCBjaGVja291dFVuYXZhaQogICAgIH0sIGNoZWNr b3V0VW5hdmFpbGFibGUpOwogfTsKIAotY2hlY2tvdXQub3B0aW1pemVCYXNlbGluZXMgPSBmdW5j dGlvbih0ZXN0TmFtZSwgY2FsbGJhY2ssIGNoZWNrb3V0VW5hdmFpbGFibGUpCitjaGVja291dC5v cHRpbWl6ZUJhc2VsaW5lcyA9IGZ1bmN0aW9uKHRlc3ROYW1lLCBzdWZmaXhlcywgY2FsbGJhY2ss IGNoZWNrb3V0VW5hdmFpbGFibGUpCiB7CiAgICAgY2FsbElmQ2hlY2tvdXRBdmFpbGFibGUoZnVu Y3Rpb24oKSB7CiAgICAgICAgIG5ldC5wb3N0KGNvbmZpZy5rTG9jYWxTZXJ2ZXJVUkwgKyAnL29w dGltaXplYmFzZWxpbmVzPycgKyAkLnBhcmFtKHsKICAgICAgICAgICAgICd0ZXN0JzogdGVzdE5h bWUsCisgICAgICAgICAgICAnc3VmZml4ZXMnOiBzdWZmaXhlcywKICAgICAgICAgfSksIGZ1bmN0 aW9uKCkgewogICAgICAgICAgICAgY2FsbGJhY2soKTsKICAgICAgICAgfSk7CkBAIC0xMDIsOSAr MTAzLDEzIEBAIGNoZWNrb3V0LnJlYmFzZWxpbmUgPSBmdW5jdGlvbihmYWlsdXJlSW5mb0xpc3Qs IGNhbGxiYWNrLCBwcm9ncmVzc0NhbGxiYWNrLCBjaGVjCiB7CiAgICAgY2FsbElmQ2hlY2tvdXRB dmFpbGFibGUoZnVuY3Rpb24oKSB7CiAgICAgICAgIGJhc2UuY2FsbEluU2VxdWVuY2UoZnVuY3Rp b24oZmFpbHVyZUluZm8sIGNhbGxiYWNrKSB7CisgICAgICAgICAgICAvLyBGSVhNRTogRG8gd2Ug bmVlZCB0byBoYW5kbGUgbGlzdHMgd2l0aCBtdWx0aXBsZSBmYWlsdXJlIHR5cGVzPworICAgICAg ICAgICAgdmFyIHN1ZmZpeGVzID0gcmVzdWx0cy5mYWlsdXJlVHlwZVRvRXh0ZW5zaW9uTGlzdChm YWlsdXJlSW5mby5mYWlsdXJlVHlwZUxpc3RbMF0pOworCiAgICAgICAgICAgICBuZXQucG9zdChj b25maWcua0xvY2FsU2VydmVyVVJMICsgJy9yZWJhc2VsaW5lPycgKyAkLnBhcmFtKHsKICAgICAg ICAgICAgICAgICAnYnVpbGRlcic6IGZhaWx1cmVJbmZvLmJ1aWxkZXJOYW1lLAogICAgICAgICAg ICAgICAgICd0ZXN0JzogZmFpbHVyZUluZm8udGVzdE5hbWUsCisgICAgICAgICAgICAgICAgJ3N1 ZmZpeGVzJzogc3VmZml4ZXMuam9pbignLCcpLAogICAgICAgICAgICAgfSksIGZ1bmN0aW9uKCkg ewogICAgICAgICAgICAgICAgIGlmIChwcm9ncmVzc0NhbGxiYWNrKQogICAgICAgICAgICAgICAg ICAgICBwcm9ncmVzc0NhbGxiYWNrKGZhaWx1cmVJbmZvKTsKQEAgLTExMiw3ICsxMTcsNyBAQCBj aGVja291dC5yZWJhc2VsaW5lID0gZnVuY3Rpb24oZmFpbHVyZUluZm9MaXN0LCBjYWxsYmFjaywg cHJvZ3Jlc3NDYWxsYmFjaywgY2hlYwogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0sIGZhaWx1 cmVJbmZvTGlzdCwgZnVuY3Rpb24oKSB7CiAgICAgICAgICAgICB2YXIgdGVzdE5hbWVMaXN0ID0g YmFzZS51bmlxdWlmeUFycmF5KGZhaWx1cmVJbmZvTGlzdC5tYXAoZnVuY3Rpb24oZmFpbHVyZUlu Zm8pIHsgcmV0dXJuIGZhaWx1cmVJbmZvLnRlc3ROYW1lOyB9KSk7Ci0gICAgICAgICAgICBiYXNl LmNhbGxJblNlcXVlbmNlKGNoZWNrb3V0Lm9wdGltaXplQmFzZWxpbmVzLCB0ZXN0TmFtZUxpc3Qs IGNhbGxiYWNrKTsKKyAgICAgICAgICAgIGJhc2UuY2FsbEluU2VxdWVuY2UoY2hlY2tvdXQub3B0 aW1pemVCYXNlbGluZXMsIHRlc3ROYW1lTGlzdCwgc3VmZml4ZXMsIGNhbGxiYWNrKTsKICAgICAg ICAgfSk7CiAgICAgfSwgY2hlY2tvdXRVbmF2YWlsYWJsZSk7CiB9OwpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQppbmRleCA4M2FhNmE2 NDA5OTQ2NDE4MTRjNGM0OTZkZTAyNGRhYzM0YmQ2NTIyLi41NDhhOTE5ODY0NWVmZDYwYjA5MDZi NGE5ODg4OWFlODRmZGFkNTQyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcmViYXNlbGluZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcmViYXNlbGluZS5weQpAQCAtNDcsNiArNDcsNyBAQCBmcm9tIHdlYmtpdHB5 LnRvb2wuZ3JhbW1hciBpbXBvcnQgcGx1cmFsaXplCiBmcm9tIHdlYmtpdHB5LnRvb2wubXVsdGlj b21tYW5kdG9vbCBpbXBvcnQgQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQKIAogCisjIEZJWE1F OiBQdWxsIHRoaXMgZnJvbSBQb3J0LmJhc2VsaW5lX2V4dGVuc2lvbnMoKS4KIF9iYXNlbGluZV9z dWZmaXhfbGlzdCA9IFsncG5nJywgJ3dhdicsICd0eHQnXQogCiAKQEAgLTU1LDcgKzU2LDE2IEBA IGRlZiBfYmFzZWxpbmVfbmFtZShmcywgdGVzdF9uYW1lLCBzdWZmaXgpOgogICAgIHJldHVybiBm cy5zcGxpdGV4dCh0ZXN0X25hbWUpWzBdICsgVGVzdFJlc3VsdFdyaXRlci5GSUxFTkFNRV9TVUZG SVhfRVhQRUNURUQgKyAiLiIgKyBzdWZmaXgKIAogCi1jbGFzcyBSZWJhc2VsaW5lVGVzdChBYnN0 cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CitjbGFzcyBBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1h bmQoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmKToK KyAgICAgICAgb3B0aW9ucyA9IFsKKyAgICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCct LXN1ZmZpeGVzJywgZGVmYXVsdD0nLCcuam9pbihfYmFzZWxpbmVfc3VmZml4X2xpc3QpLCBhY3Rp b249J3N0b3JlJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J2ZpbGUg dHlwZXMgdG8gcmViYXNlbGluZScpXQorICAgICAgICBBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFu ZC5fX2luaXRfXyhzZWxmLCBvcHRpb25zPW9wdGlvbnMpCisgICAgICAgIHNlbGYuX2Jhc2VsaW5l X3N1ZmZpeF9saXN0ID0gX2Jhc2VsaW5lX3N1ZmZpeF9saXN0CisKKworY2xhc3MgUmViYXNlbGlu ZVRlc3QoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKICAgICBuYW1lID0gInJlYmFzZWxp bmUtdGVzdCIKICAgICBoZWxwX3RleHQgPSAiUmViYXNlbGluZSBhIHNpbmdsZSB0ZXN0IGZyb20g YSBidWlsZGJvdC4gIChDdXJyZW50bHkgd29ya3Mgb25seSB3aXRoIGJ1aWxkLmNocm9taXVtLm9y ZyBidWlsZGJvdHMuKSIKICAgICBhcmd1bWVudF9uYW1lcyA9ICJCVUlMREVSX05BTUUgVEVTVF9O QU1FIFtQTEFURk9STVNfVE9fTU9WRV9FWElTVElOR19CQVNFTElORVNfVE9dIgpAQCAtMTQzLDEx ICsxNTMsMTMgQEAgY2xhc3MgUmViYXNlbGluZVRlc3QoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1h bmQpOgogICAgICAgICBzZWxmLl9zYXZlX2Jhc2VsaW5lKHNlbGYuX3Rvb2wud2ViLmdldF9iaW5h cnkoc291cmNlX2Jhc2VsaW5lLCBjb252ZXJ0XzQwNF90b19Ob25lPVRydWUpLCB0YXJnZXRfYmFz ZWxpbmUpCiAKICAgICBkZWYgX3JlYmFzZWxpbmVfdGVzdF9hbmRfdXBkYXRlX2V4cGVjdGF0aW9u cyhzZWxmLCBidWlsZGVyX25hbWUsIHRlc3RfbmFtZSwgcGxhdGZvcm1zX3RvX21vdmVfZXhpc3Rp bmdfYmFzZWxpbmVzX3RvKToKLSAgICAgICAgZm9yIHN1ZmZpeCBpbiBfYmFzZWxpbmVfc3VmZml4 X2xpc3Q6CisgICAgICAgIGZvciBzdWZmaXggaW4gc2VsZi5fYmFzZWxpbmVfc3VmZml4X2xpc3Q6 CiAgICAgICAgICAgICBzZWxmLl9yZWJhc2VsaW5lX3Rlc3QoYnVpbGRlcl9uYW1lLCB0ZXN0X25h bWUsIHBsYXRmb3Jtc190b19tb3ZlX2V4aXN0aW5nX2Jhc2VsaW5lc190bywgc3VmZml4KQogICAg ICAgICBzZWxmLl91cGRhdGVfZXhwZWN0YXRpb25zX2ZpbGUoYnVpbGRlcl9uYW1lLCB0ZXN0X25h bWUpCiAKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToKKyAgICAg ICAgc2VsZi5fYmFzZWxpbmVfc3VmZml4X2xpc3QgPSBvcHRpb25zLnN1ZmZpeGVzLnNwbGl0KCcs JykKKwogICAgICAgICBpZiBsZW4oYXJncykgPiAyOgogICAgICAgICAgICAgcGxhdGZvcm1zX3Rv X21vdmVfZXhpc3RpbmdfYmFzZWxpbmVzX3RvID0gYXJnc1syOl0KICAgICAgICAgZWxzZToKQEAg LTE1NSwxOCArMTY3LDIwIEBAIGNsYXNzIFJlYmFzZWxpbmVUZXN0KEFic3RyYWN0RGVjbGFyYXRp dmVDb21tYW5kKToKICAgICAgICAgc2VsZi5fcmViYXNlbGluZV90ZXN0X2FuZF91cGRhdGVfZXhw ZWN0YXRpb25zKGFyZ3NbMF0sIGFyZ3NbMV0sIHBsYXRmb3Jtc190b19tb3ZlX2V4aXN0aW5nX2Jh c2VsaW5lc190bykKIAogCi1jbGFzcyBPcHRpbWl6ZUJhc2VsaW5lcyhBYnN0cmFjdERlY2xhcmF0 aXZlQ29tbWFuZCk6CitjbGFzcyBPcHRpbWl6ZUJhc2VsaW5lcyhBYnN0cmFjdFJlYmFzZWxpbmlu Z0NvbW1hbmQpOgogICAgIG5hbWUgPSAib3B0aW1pemUtYmFzZWxpbmVzIgogICAgIGhlbHBfdGV4 dCA9ICJSZXNodWZmbGVzIHRoZSBiYXNlbGluZXMgZm9yIHRoZSBnaXZlbiB0ZXN0cyB0byB1c2Ug YXMgbGl0dGUgc3BhY2Ugb24gZGlzayBhcyBwb3NzaWJsZS4iCiAgICAgYXJndW1lbnRfbmFtZXMg PSAiVEVTVF9OQU1FUyIKIAogICAgIGRlZiBfb3B0aW1pemVfYmFzZWxpbmUoc2VsZiwgdGVzdF9u YW1lKToKLSAgICAgICAgZm9yIHN1ZmZpeCBpbiBfYmFzZWxpbmVfc3VmZml4X2xpc3Q6CisgICAg ICAgIGZvciBzdWZmaXggaW4gc2VsZi5fYmFzZWxpbmVfc3VmZml4X2xpc3Q6CiAgICAgICAgICAg ICBiYXNlbGluZV9uYW1lID0gX2Jhc2VsaW5lX25hbWUoc2VsZi5fdG9vbC5maWxlc3lzdGVtLCB0 ZXN0X25hbWUsIHN1ZmZpeCkKICAgICAgICAgICAgIGlmIG5vdCBzZWxmLl9iYXNlbGluZV9vcHRp bWl6ZXIub3B0aW1pemUoYmFzZWxpbmVfbmFtZSk6CiAgICAgICAgICAgICAgICAgcHJpbnQgIkh1 ZXJpc3RpY3MgZmFpbGVkIHRvIG9wdGltaXplICVzIiAlIGJhc2VsaW5lX25hbWUKIAogICAgIGRl ZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICBzZWxmLl9iYXNl bGluZV9zdWZmaXhfbGlzdCA9IG9wdGlvbnMuc3VmZml4ZXMuc3BsaXQoJywnKQorICAgICAgICBz ZWxmLl9iYXNlbGluZV9zdWZmaXhfbGlzdCA9IG9wdGlvbnMuc3VmZml4ZXMKICAgICAgICAgc2Vs Zi5fYmFzZWxpbmVfb3B0aW1pemVyID0gQmFzZWxpbmVPcHRpbWl6ZXIodG9vbCkKICAgICAgICAg c2VsZi5fcG9ydCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldCgiY2hyb21pdW0td2luLXdpbjciKSAg IyBGSVhNRTogVGhpcyBzaG91bGQgYmUgc2VsZWN0YWJsZS4KIApAQCAtMTc1LDcgKzE4OSw3IEBA IGNsYXNzIE9wdGltaXplQmFzZWxpbmVzKEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKICAg ICAgICAgICAgIHNlbGYuX29wdGltaXplX2Jhc2VsaW5lKHRlc3RfbmFtZSkKIAogCi1jbGFzcyBB bmFseXplQmFzZWxpbmVzKEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKK2NsYXNzIEFuYWx5 emVCYXNlbGluZXMoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKICAgICBuYW1lID0gImFu YWx5emUtYmFzZWxpbmVzIgogICAgIGhlbHBfdGV4dCA9ICJBbmFseXplcyB0aGUgYmFzZWxpbmVz IGZvciB0aGUgZ2l2ZW4gdGVzdHMgYW5kIHByaW50cyByZXN1bHRzIHRoYXQgYXJlIGlkZW50aWNh bC4iCiAgICAgYXJndW1lbnRfbmFtZXMgPSAiVEVTVF9OQU1FUyIKQEAgLTE4OCwxMiArMjAyLDEz IEBAIGNsYXNzIEFuYWx5emVCYXNlbGluZXMoQWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgog ICAgICAgICAgICAgcHJpbnQgJyAnLmpvaW4ocmVzdWx0c19uYW1lcykKIAogICAgIGRlZiBfYW5h bHl6ZV9iYXNlbGluZShzZWxmLCB0ZXN0X25hbWUpOgotICAgICAgICBmb3Igc3VmZml4IGluIF9i YXNlbGluZV9zdWZmaXhfbGlzdDoKKyAgICAgICAgZm9yIHN1ZmZpeCBpbiBzZWxmLl9iYXNlbGlu ZV9zdWZmaXhfbGlzdDoKICAgICAgICAgICAgIGJhc2VsaW5lX25hbWUgPSBfYmFzZWxpbmVfbmFt ZShzZWxmLl90b29sLmZpbGVzeXN0ZW0sIHRlc3RfbmFtZSwgc3VmZml4KQogICAgICAgICAgICAg ZGlyZWN0b3JpZXNfYnlfcmVzdWx0ID0gc2VsZi5fYmFzZWxpbmVfb3B0aW1pemVyLmRpcmVjdG9y aWVzX2J5X3Jlc3VsdChiYXNlbGluZV9uYW1lKQogICAgICAgICAgICAgc2VsZi5fcHJpbnQoYmFz ZWxpbmVfbmFtZSwgZGlyZWN0b3JpZXNfYnlfcmVzdWx0KQogCiAgICAgZGVmIGV4ZWN1dGUoc2Vs Ziwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgICAgIHNlbGYuX2Jhc2VsaW5lX3N1ZmZpeF9s aXN0ID0gb3B0aW9ucy5zdWZmaXhlcy5zcGxpdCgnLCcpCiAgICAgICAgIHNlbGYuX2Jhc2VsaW5l X29wdGltaXplciA9IEJhc2VsaW5lT3B0aW1pemVyKHRvb2wpCiAgICAgICAgIHNlbGYuX3BvcnQg PSB0b29sLnBvcnRfZmFjdG9yeS5nZXQoImNocm9taXVtLXdpbi13aW43IikgICMgRklYTUU6IFRo aXMgc2hvdWxkIGJlIHNlbGVjdGFibGUuCiAKQEAgLTI0OCw2ICsyNjMsNyBAQCBjbGFzcyBSZWJh c2VsaW5lRXhwZWN0YXRpb25zKEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKICAgICAgICAg Zm9yIHRlc3RfbmFtZSBpbiBzZWxmLl90ZXN0c190b19yZWJhc2VsaW5lKHNlbGYuX3Rvb2wucG9y dF9mYWN0b3J5LmdldChwb3J0X25hbWUpKToKICAgICAgICAgICAgIHNlbGYuX3RvdWNoZWRfdGVz dF9uYW1lcy5hZGQodGVzdF9uYW1lKQogICAgICAgICAgICAgcHJpbnQgIiAgICAlcyIgJSB0ZXN0 X25hbWUKKyAgICAgICAgICAgICMgRklYTUU6IG5lZWQgdG8gZXh0cmFjdCB0aGUgY29ycmVjdCBs aXN0IG9mIHN1ZmZpeGVzIGhlcmUuCiAgICAgICAgICAgICBzZWxmLl9ydW5fd2Via2l0X3BhdGNo KFsncmViYXNlbGluZS10ZXN0JywgYnVpbGRlcl9uYW1lLCB0ZXN0X25hbWVdKQogCiAgICAgZGVm IGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkKaW5kZXggM2Qw OWI1Zjc2OTdiOTYzMzdmNTVlMDcxYmIyNTJlZDBkYWJkYjFiYi4uZjQzNDAyODk3NDJlMDYxYzg0 M2M1YmRjZTAyYjk2NGJhZWFiNmEzZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL3NlcnZlcnMvZ2FyZGVuaW5nc2VydmVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlci5weQpAQCAtMTM5LDggKzEzOSwxMCBA QCBjbGFzcyBHYXJkZW5pbmdIVFRQUmVxdWVzdEhhbmRsZXIoUmVmbGVjdGlvbkhhbmRsZXIpOgog ICAgICAgICBidWlsZGVyID0gc2VsZi5xdWVyeVsnYnVpbGRlciddWzBdCiAgICAgICAgIGNvbW1h bmQgPSBbCiAgICAgICAgICAgICAncmViYXNlbGluZS10ZXN0JywKKyAgICAgICAgICAgICctLXN1 ZmZpeGVzJywgc2VsZi5xdWVyeVsnc3VmZml4ZXMnXVswXSwKICAgICAgICAgICAgIGJ1aWxkZXIs CiAgICAgICAgICAgICBzZWxmLnF1ZXJ5Wyd0ZXN0J11bMF0sCisKICAgICAgICAgXQogICAgICAg ICBjb21tYW5kLmV4dGVuZChidWlsZGVycy5mYWxsYmFja19wb3J0X25hbWVzX2Zvcl9uZXdfcG9y dChidWlsZGVyKSkKICAgICAgICAgc2VsZi5fcnVuX3dlYmtpdF9wYXRjaChjb21tYW5kKQpAQCAt MTUwLDYgKzE1Miw3IEBAIGNsYXNzIEdhcmRlbmluZ0hUVFBSZXF1ZXN0SGFuZGxlcihSZWZsZWN0 aW9uSGFuZGxlcik6CiAgICAgICAgIHRlc3QgPSBzZWxmLnF1ZXJ5Wyd0ZXN0J11bMF0KICAgICAg ICAgc2VsZi5fcnVuX3dlYmtpdF9wYXRjaChbCiAgICAgICAgICAgICAnb3B0aW1pemUtYmFzZWxp bmVzJywKKyAgICAgICAgICAgICctLXN1ZmZpeGVzJywgc2VsZi5xdWVyeVsnc3VmZml4ZXMnXVsw XSwKICAgICAgICAgICAgIHRlc3QsCiAgICAgICAgIF0pCiAgICAgICAgIHNlbGYuX3NlcnZlX3Rl eHQoJ3N1Y2Nlc3MnKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3Nl cnZlcnMvZ2FyZGVuaW5nc2VydmVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL3NlcnZlcnMvZ2FyZGVuaW5nc2VydmVyX3VuaXR0ZXN0LnB5CmluZGV4IDEzZTkwMDFi NzcyNTk0NTUyMmU2YTlmYmYxMmI5MTk0NzQwOTdiZGMuLmM5NmI2NjAzNDNjNjYwMDQ4ZDNkMTRk Y2I0Yzk3NWFjOGFmYWMyZjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXJfdW5pdHRlc3QucHkKQEAgLTE4 MywyMCArMTgzLDIwIEBAIGNsYXNzIEdhcmRlbmluZ1NlcnZlclRlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogCiAgICAgZGVmIHRlc3RfcmViYXNlbGluZShzZWxmKToKICAgICAgICAgYnVpbGRlcnMu X2V4YWN0X21hdGNoZXMgPSB7Ik1PQ0sgYnVpbGRlciI6IHsicG9ydF9uYW1lIjogIm1vY2stcG9y dC1uYW1lIiwgInNwZWNpZmllcnMiOiBzZXQoWyJtb2NrLXNwZWNpZmllciJdKX19Ci0gICAgICAg IGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGlu ZS10ZXN0JywgJ01PQ0sgYnVpbGRlcicsICd1c2VyLXNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwn XSwgY3dkPS9tb2NrLWNoZWNrb3V0XG4iCisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NL IHJ1bl9jb21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0JywgJy0tc3VmZml4ZXMnLCAn dHh0LHBuZycsICdNT0NLIGJ1aWxkZXInLCAndXNlci1zY3JpcHRzL2Fub3RoZXItdGVzdC5odG1s J10sIGN3ZD0vbW9jay1jaGVja291dFxuIgogICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAiPT0g QmVnaW4gUmVzcG9uc2UgPT1cbnN1Y2Nlc3Ncbj09IEVuZCBSZXNwb25zZSA9PVxuIgotICAgICAg ICBzZWxmLl9wb3N0X3RvX3BhdGgoIi9yZWJhc2VsaW5lP2J1aWxkZXI9TU9DSytidWlsZGVyJnRl c3Q9dXNlci1zY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sIiwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVj dGVkX3N0ZGVyciwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKKyAgICAgICAgc2Vs Zi5fcG9zdF90b19wYXRoKCIvcmViYXNlbGluZT9idWlsZGVyPU1PQ0srYnVpbGRlciZ0ZXN0PXVz ZXItc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCZzdWZmaXhlcz10eHQscG5nIiwgZXhwZWN0ZWRf c3RkZXJyPWV4cGVjdGVkX3N0ZGVyciwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkK IAogICAgIGRlZiB0ZXN0X3JlYmFzZWxpbmVfbmV3X3BvcnQoc2VsZik6CiAgICAgICAgIGJ1aWxk ZXJzLl9leGFjdF9tYXRjaGVzID0geyJNT0NLIGJ1aWxkZXIiOiB7InBvcnRfbmFtZSI6ICJtb2Nr LXBvcnQtbmFtZSIsICJzcGVjaWZpZXJzIjogc2V0KFsibW9jay1zcGVjaWZpZXIiXSksICJtb3Zl X292ZXJ3cml0dGVuX2Jhc2VsaW5lc190byI6IFsibW9jay1wb3J0LWZhbGxiYWNrIiwgIm1vY2st cG9ydC1mYWxsYmFjazIiXX19Ci0gICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9j b21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0JywgJ01PQ0sgYnVpbGRlcicsICd1c2Vy LXNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwnLCAnbW9jay1wb3J0LWZhbGxiYWNrJywgJ21vY2st cG9ydC1mYWxsYmFjazInXSwgY3dkPS9tb2NrLWNoZWNrb3V0XG4iCisgICAgICAgIGV4cGVjdGVk X3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0Jywg Jy0tc3VmZml4ZXMnLCAndHh0LHBuZycsICdNT0NLIGJ1aWxkZXInLCAndXNlci1zY3JpcHRzL2Fu b3RoZXItdGVzdC5odG1sJywgJ21vY2stcG9ydC1mYWxsYmFjaycsICdtb2NrLXBvcnQtZmFsbGJh Y2syJ10sIGN3ZD0vbW9jay1jaGVja291dFxuIgogICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAi PT0gQmVnaW4gUmVzcG9uc2UgPT1cbnN1Y2Nlc3Ncbj09IEVuZCBSZXNwb25zZSA9PVxuIgotICAg ICAgICBzZWxmLl9wb3N0X3RvX3BhdGgoIi9yZWJhc2VsaW5lP2J1aWxkZXI9TU9DSytidWlsZGVy JnRlc3Q9dXNlci1zY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sIiwgZXhwZWN0ZWRfc3RkZXJyPWV4 cGVjdGVkX3N0ZGVyciwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkKKyAgICAgICAg c2VsZi5fcG9zdF90b19wYXRoKCIvcmViYXNlbGluZT9idWlsZGVyPU1PQ0srYnVpbGRlciZ0ZXN0 PXVzZXItc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCZzdWZmaXhlcz10eHQscG5nIiwgZXhwZWN0 ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVyciwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91 dCkKIAogICAgIGRlZiB0ZXN0X29wdGltaXplYmFzZWxpbmVzKHNlbGYpOgotICAgICAgICBleHBl Y3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydlY2hvJywgJ29wdGltaXplLWJhc2Vs aW5lcycsICd1c2VyLXNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwnXSwgY3dkPS9tb2NrLWNoZWNr b3V0XG4iCisgICAgICAgIGV4cGVjdGVkX3N0ZGVyciA9ICJNT0NLIHJ1bl9jb21tYW5kOiBbJ2Vj aG8nLCAnb3B0aW1pemUtYmFzZWxpbmVzJywgJy0tc3VmZml4ZXMnLCAndHh0LHBuZycsICd1c2Vy LXNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwnXSwgY3dkPS9tb2NrLWNoZWNrb3V0XG4iCiAgICAg ICAgIGV4cGVjdGVkX3N0ZG91dCA9ICI9PSBCZWdpbiBSZXNwb25zZSA9PVxuc3VjY2Vzc1xuPT0g RW5kIFJlc3BvbnNlID09XG4iCi0gICAgICAgIHNlbGYuX3Bvc3RfdG9fcGF0aCgiL29wdGltaXpl YmFzZWxpbmVzP3Rlc3Q9dXNlci1zY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sIiwgZXhwZWN0ZWRf c3RkZXJyPWV4cGVjdGVkX3N0ZGVyciwgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCkK KyAgICAgICAgc2VsZi5fcG9zdF90b19wYXRoKCIvb3B0aW1pemViYXNlbGluZXM/dGVzdD11c2Vy LXNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwmc3VmZml4ZXM9dHh0LHBuZyIsIGV4cGVjdGVkX3N0 ZGVycj1leHBlY3RlZF9zdGRlcnIsIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCiAK ICAgICBkZWYgdGVzdF91cGRhdGVleHBlY3RhdGlvbnMoc2VsZik6CiAgICAgICAgIGV4cGVjdGVk X3N0ZGVyciA9ICIiCg== 141515 2012-05-11 15:44:47 -0700 2012-05-11 15:48:15 -0700 make js tests work, update w/ review feedback bug-86242-20120511154445.patch text/plain 16895 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2Nzg3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNTMxNTE5OTE4OTViZjNkOGZiODRjMzMwNDdmZjk4ZGUy YmVlMWFlZi4uZWM3Yjc5ZDRlM2Y1ZGU0NGNlZGZkODgxMDIzOTliNDg4MGM2ZDJjNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQy IEBACiAyMDEyLTA1LTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIGdhcmRlbi1vLW1hdGljIHNob3VsZCBzcGVjaWZ5IHdoaWNoIHR5cGVzIG9mIGJhc2Vs aW5lcyB0byByZWJhc2VsaW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NjI0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoaXMgY2hhbmdlIG1vZGlmaWVzIGdhcmRlbi1vLW1hdGljIHNvIHRoYXQgd2Ug YXJlIGV4cGxpY2l0CisgICAgICAgIGFib3V0IHdoZXRoZXIgdG8gcmViYXNlbGluZSB0aGUgdGV4 dCBmaWxlLCB0aGUgaW1hZ2UgZmlsZSwgb3IKKyAgICAgICAgYm90aC4gVGhpcyBzaG91bGQgcHJl dmVudCB1cyBmcm9tIHB1bGxpbmcgaW5jb3JyZWN0IG9yCisgICAgICAgIHVuZXhwZWN0ZWQgYmFz ZWxpbmVzIG9mZiB0aGUgYm90cy4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxk LndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL2NoZWNr b3V0LmpzOgorICAgICAgICAoLik6CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQu d2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY2hlY2tv dXRfdW5pdHRlc3RzLmpzOgorICAgICAgICAoLik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6CisgICAgICAgIChBYnN0cmFjdFJlYmFzZWxp bmluZ0NvbW1hbmQpOgorICAgICAgICAoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kLl9faW5p dF9fKToKKyAgICAgICAgKFJlYmFzZWxpbmVUZXN0KToKKyAgICAgICAgKFJlYmFzZWxpbmVUZXN0 Ll9yZWJhc2VsaW5lX3Rlc3RfYW5kX3VwZGF0ZV9leHBlY3RhdGlvbnMpOgorICAgICAgICAoUmVi YXNlbGluZVRlc3QuZXhlY3V0ZSk6CisgICAgICAgIChPcHRpbWl6ZUJhc2VsaW5lcyk6CisgICAg ICAgIChPcHRpbWl6ZUJhc2VsaW5lcy5fb3B0aW1pemVfYmFzZWxpbmUpOgorICAgICAgICAoT3B0 aW1pemVCYXNlbGluZXMuZXhlY3V0ZSk6CisgICAgICAgIChBbmFseXplQmFzZWxpbmVzKToKKyAg ICAgICAgKEFuYWx5emVCYXNlbGluZXMuX2FuYWx5emVfYmFzZWxpbmUpOgorICAgICAgICAoQW5h bHl6ZUJhc2VsaW5lcy5leGVjdXRlKToKKyAgICAgICAgKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMu X3JlYmFzZWxpbmVfcG9ydCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZl cnMvZ2FyZGVuaW5nc2VydmVyLnB5OgorICAgICAgICAoR2FyZGVuaW5nSFRUUFJlcXVlc3RIYW5k bGVyLnJlYmFzZWxpbmUpOgorICAgICAgICAoR2FyZGVuaW5nSFRUUFJlcXVlc3RIYW5kbGVyLm9w dGltaXplYmFzZWxpbmVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVy cy9nYXJkZW5pbmdzZXJ2ZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChHYXJkZW5pbmdTZXJ2ZXJU ZXN0LnRlc3RfcmViYXNlbGluZSk6CisgICAgICAgIChHYXJkZW5pbmdTZXJ2ZXJUZXN0LnRlc3Rf cmViYXNlbGluZV9uZXdfcG9ydCk6CisgICAgICAgIChHYXJkZW5pbmdTZXJ2ZXJUZXN0LnRlc3Rf b3B0aW1pemViYXNlbGluZXMpOgorCisyMDEyLTA1LTExICBEaXJrIFByYW5rZSAgPGRwcmFua2VA Y2hyb21pdW0ub3JnPgorCiAgICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lIHNob3VsZCBm ZXRjaCBzdGFsZSBleHBlY3RhdGlvbnMgOikKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTg2MjMxCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVT dXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9z Y3JpcHRzL2NoZWNrb3V0LmpzIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY2hlY2tvdXQuanMK aW5kZXggOGUxYmM1ZDRmN2M5NjAxODdhMDk4N2Y1Yjg2ODQ0ZmUzYjBmOGRhZS4uYmVjYzkzZTkz ZWJkMDMwMzAzNDE0MzliZmEyNzU0MzkyZTVlNjU5OCAxMDA2NDQKLS0tIGEvVG9vbHMvQnVpbGRT bGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1 cmVzL3NjcmlwdHMvY2hlY2tvdXQuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY2hl Y2tvdXQuanMKQEAgLTc1LDExICs3NSwxMiBAQCBjaGVja291dC51cGRhdGVFeHBlY3RhdGlvbnMg PSBmdW5jdGlvbihmYWlsdXJlSW5mb0xpc3QsIGNhbGxiYWNrLCBjaGVja291dFVuYXZhaQogICAg IH0sIGNoZWNrb3V0VW5hdmFpbGFibGUpOwogfTsKIAotY2hlY2tvdXQub3B0aW1pemVCYXNlbGlu ZXMgPSBmdW5jdGlvbih0ZXN0TmFtZSwgY2FsbGJhY2ssIGNoZWNrb3V0VW5hdmFpbGFibGUpCitj aGVja291dC5vcHRpbWl6ZUJhc2VsaW5lcyA9IGZ1bmN0aW9uKHRlc3ROYW1lLCBzdWZmaXhlcywg Y2FsbGJhY2ssIGNoZWNrb3V0VW5hdmFpbGFibGUpCiB7CiAgICAgY2FsbElmQ2hlY2tvdXRBdmFp bGFibGUoZnVuY3Rpb24oKSB7CiAgICAgICAgIG5ldC5wb3N0KGNvbmZpZy5rTG9jYWxTZXJ2ZXJV UkwgKyAnL29wdGltaXplYmFzZWxpbmVzPycgKyAkLnBhcmFtKHsKICAgICAgICAgICAgICd0ZXN0 JzogdGVzdE5hbWUsCisgICAgICAgICAgICAnc3VmZml4ZXMnOiBzdWZmaXhlcywKICAgICAgICAg fSksIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgY2FsbGJhY2soKTsKICAgICAgICAgfSk7CkBA IC0xMDIsOSArMTAzLDEyIEBAIGNoZWNrb3V0LnJlYmFzZWxpbmUgPSBmdW5jdGlvbihmYWlsdXJl SW5mb0xpc3QsIGNhbGxiYWNrLCBwcm9ncmVzc0NhbGxiYWNrLCBjaGVjCiB7CiAgICAgY2FsbElm Q2hlY2tvdXRBdmFpbGFibGUoZnVuY3Rpb24oKSB7CiAgICAgICAgIGJhc2UuY2FsbEluU2VxdWVu Y2UoZnVuY3Rpb24oZmFpbHVyZUluZm8sIGNhbGxiYWNrKSB7CisgICAgICAgICAgICB2YXIgc3Vm Zml4ZXMgPSBiYXNlLnVuaXF1aWZ5QXJyYXkoYmFzZS5mbGF0dGVuQXJyYXkoZmFpbHVyZUluZm8u ZmFpbHVyZUluZm9MaXN0Lm1hcChyZXN1bHRzLmZhaWx1cmVUeXBlVG9FeHRlbnNpb25MaXN0KSkp LmpvaW4oJywnKTsKKwogICAgICAgICAgICAgbmV0LnBvc3QoY29uZmlnLmtMb2NhbFNlcnZlclVS TCArICcvcmViYXNlbGluZT8nICsgJC5wYXJhbSh7CiAgICAgICAgICAgICAgICAgJ2J1aWxkZXIn OiBmYWlsdXJlSW5mby5idWlsZGVyTmFtZSwKICAgICAgICAgICAgICAgICAndGVzdCc6IGZhaWx1 cmVJbmZvLnRlc3ROYW1lLAorICAgICAgICAgICAgICAgICdzdWZmaXhlcyc6IHN1ZmZpeGVzLAog ICAgICAgICAgICAgfSksIGZ1bmN0aW9uKCkgewogICAgICAgICAgICAgICAgIGlmIChwcm9ncmVz c0NhbGxiYWNrKQogICAgICAgICAgICAgICAgICAgICBwcm9ncmVzc0NhbGxiYWNrKGZhaWx1cmVJ bmZvKTsKQEAgLTExMiw3ICsxMTYsMTEgQEAgY2hlY2tvdXQucmViYXNlbGluZSA9IGZ1bmN0aW9u KGZhaWx1cmVJbmZvTGlzdCwgY2FsbGJhY2ssIHByb2dyZXNzQ2FsbGJhY2ssIGNoZWMKICAgICAg ICAgICAgIH0pOwogICAgICAgICB9LCBmYWlsdXJlSW5mb0xpc3QsIGZ1bmN0aW9uKCkgewogICAg ICAgICAgICAgdmFyIHRlc3ROYW1lTGlzdCA9IGJhc2UudW5pcXVpZnlBcnJheShmYWlsdXJlSW5m b0xpc3QubWFwKGZ1bmN0aW9uKGZhaWx1cmVJbmZvKSB7IHJldHVybiBmYWlsdXJlSW5mby50ZXN0 TmFtZTsgfSkpOwotICAgICAgICAgICAgYmFzZS5jYWxsSW5TZXF1ZW5jZShjaGVja291dC5vcHRp bWl6ZUJhc2VsaW5lcywgdGVzdE5hbWVMaXN0LCBjYWxsYmFjayk7CisgICAgICAgICAgICB2YXIg c3VmZml4ZXMgPSBiYXNlLnVuaXF1aWZ5QXJyYXkoYmFzZS5mbGF0dGVuQXJyYXkoCisgICAgICAg ICAgICAgICAgZmFpbHVyZUluZm9MaXN0Lm1hcChmdW5jdGlvbihmYWlsdXJlSW5mbykgeworICAg ICAgICAgICAgICAgICAgICByZXR1cm4gYmFzZS5mbGF0dGVuQXJyYXkoZmFpbHVyZUluZm8uZmFp bHVyZUluZm9MaXN0Lm1hcChyZXN1bHRzLmZhaWx1cmVUeXBlVG9FeHRlbnNpb25MaXN0KSkKKyAg ICAgICAgICAgICAgICB9KSkpLmpvaW4oJywnKTsKKyAgICAgICAgICAgIGJhc2UuY2FsbEluU2Vx dWVuY2UoZnVuY3Rpb24odGVzdE5hbWUsIGNhbGxiYWNrKSB7IGNoZWNrb3V0Lm9wdGltaXplQmFz ZWxpbmVzKHRlc3ROYW1lLCBzdWZmaXhlcywgY2FsbGJhY2spfSwgdGVzdE5hbWVMaXN0LCBjYWxs YmFjayk7CiAgICAgICAgIH0pOwogICAgIH0sIGNoZWNrb3V0VW5hdmFpbGFibGUpOwogfTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmln L3B1YmxpY19odG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL2NoZWNrb3V0X3VuaXR0ZXN0cy5qcyBi L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL3B1YmxpY19o dG1sL1Rlc3RGYWlsdXJlcy9zY3JpcHRzL2NoZWNrb3V0X3VuaXR0ZXN0cy5qcwppbmRleCA0ZDM4 YmQyZTJmMzEwYmIzMGRjYzEzMTI5ZTBmY2I2ZTBmMWE0MTBlLi5iZDY2ZDlhZjc3MjcyYzA0MzJm OWU0MDhlNDg3Yzg0ZDI0MjAxMzUyIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJsaWNfaHRtbC9UZXN0RmFpbHVyZXMvc2NyaXB0 cy9jaGVja291dF91bml0dGVzdHMuanMKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvcHVibGljX2h0bWwvVGVzdEZhaWx1cmVzL3NjcmlwdHMvY2hl Y2tvdXRfdW5pdHRlc3RzLmpzCkBAIC02MCwxMiArNjAsMTIgQEAgdGVzdCgib3B0aW1pemVCYXNl bGluZXMiLCAzLCBmdW5jdGlvbigpIHsKICAgICB2YXIgc2ltdWxhdG9yID0gbmV3IE5ldHdvcmtT aW11bGF0b3IoKTsKICAgICBzaW11bGF0b3IucG9zdCA9IGZ1bmN0aW9uKHVybCwgY2FsbGJhY2sp CiAgICAgewotICAgICAgICBlcXVhbHModXJsLCAnaHR0cDovLzEyNy4wLjAuMTo4MTI3L29wdGlt aXplYmFzZWxpbmVzP3Rlc3Q9YW5vdGhlciUyRnRlc3Quc3ZnJyk7CisgICAgICAgIGVxdWFscyh1 cmwsICdodHRwOi8vMTI3LjAuMC4xOjgxMjcvb3B0aW1pemViYXNlbGluZXM/dGVzdD1hbm90aGVy JTJGdGVzdC5zdmcmc3VmZml4ZXM9dHh0JTJDcG5nJyk7CiAgICAgICAgIHNpbXVsYXRvci5zY2hl ZHVsZUNhbGxiYWNrKGNhbGxiYWNrKTsKICAgICB9OwogCiAgICAgc2ltdWxhdG9yLnJ1blRlc3Qo ZnVuY3Rpb24oKSB7Ci0gICAgICAgIGNoZWNrb3V0Lm9wdGltaXplQmFzZWxpbmVzKCdhbm90aGVy L3Rlc3Quc3ZnJywgZnVuY3Rpb24oKSB7CisgICAgICAgIGNoZWNrb3V0Lm9wdGltaXplQmFzZWxp bmVzKCdhbm90aGVyL3Rlc3Quc3ZnJywgJ3R4dCxwbmcnLCBmdW5jdGlvbigpIHsKICAgICAgICAg ICAgIG9rKHRydWUpOwogICAgICAgICB9KTsKICAgICB9KTsKQEAgLTk3LDEyICs5NywxNSBAQCB0 ZXN0KCJyZWJhc2VsaW5lIiwgNiwgZnVuY3Rpb24oKSB7CiAgICAgICAgIGNoZWNrb3V0LnJlYmFz ZWxpbmUoW3sKICAgICAgICAgICAgICdidWlsZGVyTmFtZSc6ICdXZWJLaXQgTGludXgnLAogICAg ICAgICAgICAgJ3Rlc3ROYW1lJzogJ2Fub3RoZXIvdGVzdC5zdmcnLAorICAgICAgICAgICAgJ2Zh aWx1cmVJbmZvTGlzdCc6IFsnSU1BR0UnXSwKICAgICAgICAgfSwgewogICAgICAgICAgICAgJ2J1 aWxkZXJOYW1lJzogJ1dlYktpdCBNYWMxMC42JywKICAgICAgICAgICAgICd0ZXN0TmFtZSc6ICdh bm90aGVyL3Rlc3Quc3ZnJywKKyAgICAgICAgICAgICdmYWlsdXJlSW5mb0xpc3QnOiBbJ0lNQUdF JywgJ1RFWFQnLCAnSU1BR0UrVEVYVCddLAogICAgICAgICB9LCB7CiAgICAgICAgICAgICAnYnVp bGRlck5hbWUnOiAnV2Via2l0IFZpc3RhJywKICAgICAgICAgICAgICd0ZXN0TmFtZSc6ICdmYXN0 L3Rlc3QuaHRtbCcsCisgICAgICAgICAgICAnZmFpbHVyZUluZm9MaXN0JzogWydJTUFHRStURVhU J10sCiAgICAgICAgIH1dLCBmdW5jdGlvbigpIHsKICAgICAgICAgICAgIG9rKHRydWUpOwogICAg ICAgICB9LCBmdW5jdGlvbihmYWlsdXJlSW5mbykgewpAQCAtMTEzLDExICsxMTYsMTEgQEAgdGVz dCgicmViYXNlbGluZSIsIDYsIGZ1bmN0aW9uKCkgewogICAgIH0pOwogCiAgICAgZGVlcEVxdWFs KHJlcXVlc3RlZFVSTHMsIFsKLSAgICAgICAgImh0dHA6Ly8xMjcuMC4wLjE6ODEyNy9yZWJhc2Vs aW5lP2J1aWxkZXI9V2ViS2l0K0xpbnV4JnRlc3Q9YW5vdGhlciUyRnRlc3Quc3ZnIiwKLSAgICAg ICAgImh0dHA6Ly8xMjcuMC4wLjE6ODEyNy9yZWJhc2VsaW5lP2J1aWxkZXI9V2ViS2l0K01hYzEw LjYmdGVzdD1hbm90aGVyJTJGdGVzdC5zdmciLAotICAgICAgICAiaHR0cDovLzEyNy4wLjAuMTo4 MTI3L3JlYmFzZWxpbmU/YnVpbGRlcj1XZWJraXQrVmlzdGEmdGVzdD1mYXN0JTJGdGVzdC5odG1s IiwKLSAgICAgICAgImh0dHA6Ly8xMjcuMC4wLjE6ODEyNy9vcHRpbWl6ZWJhc2VsaW5lcz90ZXN0 PWFub3RoZXIlMkZ0ZXN0LnN2ZyIsCi0gICAgICAgICJodHRwOi8vMTI3LjAuMC4xOjgxMjcvb3B0 aW1pemViYXNlbGluZXM/dGVzdD1mYXN0JTJGdGVzdC5odG1sIgorICAgICAgICAiaHR0cDovLzEy Ny4wLjAuMTo4MTI3L3JlYmFzZWxpbmU/YnVpbGRlcj1XZWJLaXQrTGludXgmdGVzdD1hbm90aGVy JTJGdGVzdC5zdmcmc3VmZml4ZXM9cG5nIiwKKyAgICAgICAgImh0dHA6Ly8xMjcuMC4wLjE6ODEy Ny9yZWJhc2VsaW5lP2J1aWxkZXI9V2ViS2l0K01hYzEwLjYmdGVzdD1hbm90aGVyJTJGdGVzdC5z dmcmc3VmZml4ZXM9cG5nJTJDdHh0IiwKKyAgICAgICAgImh0dHA6Ly8xMjcuMC4wLjE6ODEyNy9y ZWJhc2VsaW5lP2J1aWxkZXI9V2Via2l0K1Zpc3RhJnRlc3Q9ZmFzdCUyRnRlc3QuaHRtbCZzdWZm aXhlcz10eHQlMkNwbmciLAorICAgICAgICAiaHR0cDovLzEyNy4wLjAuMTo4MTI3L29wdGltaXpl YmFzZWxpbmVzP3Rlc3Q9YW5vdGhlciUyRnRlc3Quc3ZnJnN1ZmZpeGVzPXBuZyUyQ3R4dCIsCisg ICAgICAgICJodHRwOi8vMTI3LjAuMC4xOjgxMjcvb3B0aW1pemViYXNlbGluZXM/dGVzdD1mYXN0 JTJGdGVzdC5odG1sJnN1ZmZpeGVzPXBuZyUyQ3R4dCIKICAgICBdKTsKIH0pOwogCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CmluZGV4 IDgzYWE2YTY0MDk5NDY0MTgxNGM0YzQ5NmRlMDI0ZGFjMzRiZDY1MjIuLmIzNzVlOGUwNWQ5ZDdl YmJmODUxY2NhNzdmZmYwZjg1NjBmNTIzOTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CkBAIC00Nyw2ICs0Nyw3IEBAIGZyb20g d2Via2l0cHkudG9vbC5ncmFtbWFyIGltcG9ydCBwbHVyYWxpemUKIGZyb20gd2Via2l0cHkudG9v bC5tdWx0aWNvbW1hbmR0b29sIGltcG9ydCBBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZAogCiAK KyMgRklYTUU6IFB1bGwgdGhpcyBmcm9tIFBvcnQuYmFzZWxpbmVfZXh0ZW5zaW9ucygpLgogX2Jh c2VsaW5lX3N1ZmZpeF9saXN0ID0gWydwbmcnLCAnd2F2JywgJ3R4dCddCiAKIApAQCAtNTUsNyAr NTYsMTYgQEAgZGVmIF9iYXNlbGluZV9uYW1lKGZzLCB0ZXN0X25hbWUsIHN1ZmZpeCk6CiAgICAg cmV0dXJuIGZzLnNwbGl0ZXh0KHRlc3RfbmFtZSlbMF0gKyBUZXN0UmVzdWx0V3JpdGVyLkZJTEVO QU1FX1NVRkZJWF9FWFBFQ1RFRCArICIuIiArIHN1ZmZpeAogCiAKLWNsYXNzIFJlYmFzZWxpbmVU ZXN0KEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKK2NsYXNzIEFic3RyYWN0UmViYXNlbGlu aW5nQ29tbWFuZChBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CisgICAgZGVmIF9faW5pdF9f KHNlbGYpOgorICAgICAgICBvcHRpb25zID0gWworICAgICAgICAgICAgb3B0cGFyc2UubWFrZV9v cHRpb24oJy0tc3VmZml4ZXMnLCBkZWZhdWx0PScsJy5qb2luKF9iYXNlbGluZV9zdWZmaXhfbGlz dCksIGFjdGlvbj0nc3RvcmUnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVs cD0nZmlsZSB0eXBlcyB0byByZWJhc2VsaW5lJyldCisgICAgICAgIEFic3RyYWN0RGVjbGFyYXRp dmVDb21tYW5kLl9faW5pdF9fKHNlbGYsIG9wdGlvbnM9b3B0aW9ucykKKyAgICAgICAgc2VsZi5f YmFzZWxpbmVfc3VmZml4X2xpc3QgPSBfYmFzZWxpbmVfc3VmZml4X2xpc3QKKworCitjbGFzcyBS ZWJhc2VsaW5lVGVzdChBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1hbmQpOgogICAgIG5hbWUgPSAi cmViYXNlbGluZS10ZXN0IgogICAgIGhlbHBfdGV4dCA9ICJSZWJhc2VsaW5lIGEgc2luZ2xlIHRl c3QgZnJvbSBhIGJ1aWxkYm90LiAgKEN1cnJlbnRseSB3b3JrcyBvbmx5IHdpdGggYnVpbGQuY2hy b21pdW0ub3JnIGJ1aWxkYm90cy4pIgogICAgIGFyZ3VtZW50X25hbWVzID0gIkJVSUxERVJfTkFN RSBURVNUX05BTUUgW1BMQVRGT1JNU19UT19NT1ZFX0VYSVNUSU5HX0JBU0VMSU5FU19UT10iCkBA IC0xNDMsMTEgKzE1MywxMyBAQCBjbGFzcyBSZWJhc2VsaW5lVGVzdChBYnN0cmFjdERlY2xhcmF0 aXZlQ29tbWFuZCk6CiAgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmUoc2VsZi5fdG9vbC53ZWIu Z2V0X2JpbmFyeShzb3VyY2VfYmFzZWxpbmUsIGNvbnZlcnRfNDA0X3RvX05vbmU9VHJ1ZSksIHRh cmdldF9iYXNlbGluZSkKIAogICAgIGRlZiBfcmViYXNlbGluZV90ZXN0X2FuZF91cGRhdGVfZXhw ZWN0YXRpb25zKHNlbGYsIGJ1aWxkZXJfbmFtZSwgdGVzdF9uYW1lLCBwbGF0Zm9ybXNfdG9fbW92 ZV9leGlzdGluZ19iYXNlbGluZXNfdG8pOgotICAgICAgICBmb3Igc3VmZml4IGluIF9iYXNlbGlu ZV9zdWZmaXhfbGlzdDoKKyAgICAgICAgZm9yIHN1ZmZpeCBpbiBzZWxmLl9iYXNlbGluZV9zdWZm aXhfbGlzdDoKICAgICAgICAgICAgIHNlbGYuX3JlYmFzZWxpbmVfdGVzdChidWlsZGVyX25hbWUs IHRlc3RfbmFtZSwgcGxhdGZvcm1zX3RvX21vdmVfZXhpc3RpbmdfYmFzZWxpbmVzX3RvLCBzdWZm aXgpCiAgICAgICAgIHNlbGYuX3VwZGF0ZV9leHBlY3RhdGlvbnNfZmlsZShidWlsZGVyX25hbWUs IHRlc3RfbmFtZSkKIAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wp OgorICAgICAgICBzZWxmLl9iYXNlbGluZV9zdWZmaXhfbGlzdCA9IG9wdGlvbnMuc3VmZml4ZXMu c3BsaXQoJywnKQorCiAgICAgICAgIGlmIGxlbihhcmdzKSA+IDI6CiAgICAgICAgICAgICBwbGF0 Zm9ybXNfdG9fbW92ZV9leGlzdGluZ19iYXNlbGluZXNfdG8gPSBhcmdzWzI6XQogICAgICAgICBl bHNlOgpAQCAtMTU1LDE4ICsxNjcsMTkgQEAgY2xhc3MgUmViYXNlbGluZVRlc3QoQWJzdHJhY3RE ZWNsYXJhdGl2ZUNvbW1hbmQpOgogICAgICAgICBzZWxmLl9yZWJhc2VsaW5lX3Rlc3RfYW5kX3Vw ZGF0ZV9leHBlY3RhdGlvbnMoYXJnc1swXSwgYXJnc1sxXSwgcGxhdGZvcm1zX3RvX21vdmVfZXhp c3RpbmdfYmFzZWxpbmVzX3RvKQogCiAKLWNsYXNzIE9wdGltaXplQmFzZWxpbmVzKEFic3RyYWN0 RGVjbGFyYXRpdmVDb21tYW5kKToKK2NsYXNzIE9wdGltaXplQmFzZWxpbmVzKEFic3RyYWN0UmVi YXNlbGluaW5nQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJvcHRpbWl6ZS1iYXNlbGluZXMiCiAgICAg aGVscF90ZXh0ID0gIlJlc2h1ZmZsZXMgdGhlIGJhc2VsaW5lcyBmb3IgdGhlIGdpdmVuIHRlc3Rz IHRvIHVzZSBhcyBsaXR0ZSBzcGFjZSBvbiBkaXNrIGFzIHBvc3NpYmxlLiIKICAgICBhcmd1bWVu dF9uYW1lcyA9ICJURVNUX05BTUVTIgogCiAgICAgZGVmIF9vcHRpbWl6ZV9iYXNlbGluZShzZWxm LCB0ZXN0X25hbWUpOgotICAgICAgICBmb3Igc3VmZml4IGluIF9iYXNlbGluZV9zdWZmaXhfbGlz dDoKKyAgICAgICAgZm9yIHN1ZmZpeCBpbiBzZWxmLl9iYXNlbGluZV9zdWZmaXhfbGlzdDoKICAg ICAgICAgICAgIGJhc2VsaW5lX25hbWUgPSBfYmFzZWxpbmVfbmFtZShzZWxmLl90b29sLmZpbGVz eXN0ZW0sIHRlc3RfbmFtZSwgc3VmZml4KQogICAgICAgICAgICAgaWYgbm90IHNlbGYuX2Jhc2Vs aW5lX29wdGltaXplci5vcHRpbWl6ZShiYXNlbGluZV9uYW1lKToKICAgICAgICAgICAgICAgICBw cmludCAiSHVlcmlzdGljcyBmYWlsZWQgdG8gb3B0aW1pemUgJXMiICUgYmFzZWxpbmVfbmFtZQog CiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9vbCk6CisgICAgICAgIHNl bGYuX2Jhc2VsaW5lX3N1ZmZpeF9saXN0ID0gb3B0aW9ucy5zdWZmaXhlcy5zcGxpdCgnLCcpCiAg ICAgICAgIHNlbGYuX2Jhc2VsaW5lX29wdGltaXplciA9IEJhc2VsaW5lT3B0aW1pemVyKHRvb2wp CiAgICAgICAgIHNlbGYuX3BvcnQgPSB0b29sLnBvcnRfZmFjdG9yeS5nZXQoImNocm9taXVtLXdp bi13aW43IikgICMgRklYTUU6IFRoaXMgc2hvdWxkIGJlIHNlbGVjdGFibGUuCiAKQEAgLTE3NSw3 ICsxODgsNyBAQCBjbGFzcyBPcHRpbWl6ZUJhc2VsaW5lcyhBYnN0cmFjdERlY2xhcmF0aXZlQ29t bWFuZCk6CiAgICAgICAgICAgICBzZWxmLl9vcHRpbWl6ZV9iYXNlbGluZSh0ZXN0X25hbWUpCiAK IAotY2xhc3MgQW5hbHl6ZUJhc2VsaW5lcyhBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6Citj bGFzcyBBbmFseXplQmFzZWxpbmVzKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAg bmFtZSA9ICJhbmFseXplLWJhc2VsaW5lcyIKICAgICBoZWxwX3RleHQgPSAiQW5hbHl6ZXMgdGhl IGJhc2VsaW5lcyBmb3IgdGhlIGdpdmVuIHRlc3RzIGFuZCBwcmludHMgcmVzdWx0cyB0aGF0IGFy ZSBpZGVudGljYWwuIgogICAgIGFyZ3VtZW50X25hbWVzID0gIlRFU1RfTkFNRVMiCkBAIC0xODgs MTIgKzIwMSwxMyBAQCBjbGFzcyBBbmFseXplQmFzZWxpbmVzKEFic3RyYWN0RGVjbGFyYXRpdmVD b21tYW5kKToKICAgICAgICAgICAgIHByaW50ICcgJy5qb2luKHJlc3VsdHNfbmFtZXMpCiAKICAg ICBkZWYgX2FuYWx5emVfYmFzZWxpbmUoc2VsZiwgdGVzdF9uYW1lKToKLSAgICAgICAgZm9yIHN1 ZmZpeCBpbiBfYmFzZWxpbmVfc3VmZml4X2xpc3Q6CisgICAgICAgIGZvciBzdWZmaXggaW4gc2Vs Zi5fYmFzZWxpbmVfc3VmZml4X2xpc3Q6CiAgICAgICAgICAgICBiYXNlbGluZV9uYW1lID0gX2Jh c2VsaW5lX25hbWUoc2VsZi5fdG9vbC5maWxlc3lzdGVtLCB0ZXN0X25hbWUsIHN1ZmZpeCkKICAg ICAgICAgICAgIGRpcmVjdG9yaWVzX2J5X3Jlc3VsdCA9IHNlbGYuX2Jhc2VsaW5lX29wdGltaXpl ci5kaXJlY3Rvcmllc19ieV9yZXN1bHQoYmFzZWxpbmVfbmFtZSkKICAgICAgICAgICAgIHNlbGYu X3ByaW50KGJhc2VsaW5lX25hbWUsIGRpcmVjdG9yaWVzX2J5X3Jlc3VsdCkKIAogICAgIGRlZiBl eGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgorICAgICAgICBzZWxmLl9iYXNlbGlu ZV9zdWZmaXhfbGlzdCA9IG9wdGlvbnMuc3VmZml4ZXMuc3BsaXQoJywnKQogICAgICAgICBzZWxm Ll9iYXNlbGluZV9vcHRpbWl6ZXIgPSBCYXNlbGluZU9wdGltaXplcih0b29sKQogICAgICAgICBz ZWxmLl9wb3J0ID0gdG9vbC5wb3J0X2ZhY3RvcnkuZ2V0KCJjaHJvbWl1bS13aW4td2luNyIpICAj IEZJWE1FOiBUaGlzIHNob3VsZCBiZSBzZWxlY3RhYmxlLgogCkBAIC0yNDgsNiArMjYyLDcgQEAg Y2xhc3MgUmViYXNlbGluZUV4cGVjdGF0aW9ucyhBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6 CiAgICAgICAgIGZvciB0ZXN0X25hbWUgaW4gc2VsZi5fdGVzdHNfdG9fcmViYXNlbGluZShzZWxm Ll90b29sLnBvcnRfZmFjdG9yeS5nZXQocG9ydF9uYW1lKSk6CiAgICAgICAgICAgICBzZWxmLl90 b3VjaGVkX3Rlc3RfbmFtZXMuYWRkKHRlc3RfbmFtZSkKICAgICAgICAgICAgIHByaW50ICIgICAg JXMiICUgdGVzdF9uYW1lCisgICAgICAgICAgICAjIEZJWE1FOiBuZWVkIHRvIGV4dHJhY3QgdGhl IGNvcnJlY3QgbGlzdCBvZiBzdWZmaXhlcyBoZXJlLgogICAgICAgICAgICAgc2VsZi5fcnVuX3dl YmtpdF9wYXRjaChbJ3JlYmFzZWxpbmUtdGVzdCcsIGJ1aWxkZXJfbmFtZSwgdGVzdF9uYW1lXSkK IAogICAgIGRlZiBleGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2FyZGVuaW5nc2VydmVyLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2FyZGVuaW5nc2VydmVyLnB5 CmluZGV4IDNkMDliNWY3Njk3Yjk2MzM3ZjU1ZTA3MWJiMjUyZWQwZGFiZGIxYmIuLmY0MzQwMjg5 NzQyZTA2MWM4NDNjNWJkY2UwMmI5NjRiYWVhYjZhM2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlci5weQorKysgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkKQEAgLTEzOSw4 ICsxMzksMTAgQEAgY2xhc3MgR2FyZGVuaW5nSFRUUFJlcXVlc3RIYW5kbGVyKFJlZmxlY3Rpb25I YW5kbGVyKToKICAgICAgICAgYnVpbGRlciA9IHNlbGYucXVlcnlbJ2J1aWxkZXInXVswXQogICAg ICAgICBjb21tYW5kID0gWwogICAgICAgICAgICAgJ3JlYmFzZWxpbmUtdGVzdCcsCisgICAgICAg ICAgICAnLS1zdWZmaXhlcycsIHNlbGYucXVlcnlbJ3N1ZmZpeGVzJ11bMF0sCiAgICAgICAgICAg ICBidWlsZGVyLAogICAgICAgICAgICAgc2VsZi5xdWVyeVsndGVzdCddWzBdLAorCiAgICAgICAg IF0KICAgICAgICAgY29tbWFuZC5leHRlbmQoYnVpbGRlcnMuZmFsbGJhY2tfcG9ydF9uYW1lc19m b3JfbmV3X3BvcnQoYnVpbGRlcikpCiAgICAgICAgIHNlbGYuX3J1bl93ZWJraXRfcGF0Y2goY29t bWFuZCkKQEAgLTE1MCw2ICsxNTIsNyBAQCBjbGFzcyBHYXJkZW5pbmdIVFRQUmVxdWVzdEhhbmRs ZXIoUmVmbGVjdGlvbkhhbmRsZXIpOgogICAgICAgICB0ZXN0ID0gc2VsZi5xdWVyeVsndGVzdCdd WzBdCiAgICAgICAgIHNlbGYuX3J1bl93ZWJraXRfcGF0Y2goWwogICAgICAgICAgICAgJ29wdGlt aXplLWJhc2VsaW5lcycsCisgICAgICAgICAgICAnLS1zdWZmaXhlcycsIHNlbGYucXVlcnlbJ3N1 ZmZpeGVzJ11bMF0sCiAgICAgICAgICAgICB0ZXN0LAogICAgICAgICBdKQogICAgICAgICBzZWxm Ll9zZXJ2ZV90ZXh0KCdzdWNjZXNzJykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlcl91bml0dGVzdC5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdG9vbC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlcl91bml0dGVzdC5weQppbmRl eCAxM2U5MDAxYjc3MjU5NDU1MjJlNmE5ZmJmMTJiOTE5NDc0MDk3YmRjLi5jOTZiNjYwMzQzYzY2 MDA0OGQzZDE0ZGNiNGM5NzVhYzhhZmFjMmYyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvc2VydmVycy9nYXJkZW5pbmdzZXJ2ZXJfdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL3NlcnZlcnMvZ2FyZGVuaW5nc2VydmVyX3VuaXR0ZXN0 LnB5CkBAIC0xODMsMjAgKzE4MywyMCBAQCBjbGFzcyBHYXJkZW5pbmdTZXJ2ZXJUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X3JlYmFzZWxpbmUoc2VsZik6CiAgICAgICAg IGJ1aWxkZXJzLl9leGFjdF9tYXRjaGVzID0geyJNT0NLIGJ1aWxkZXIiOiB7InBvcnRfbmFtZSI6 ICJtb2NrLXBvcnQtbmFtZSIsICJzcGVjaWZpZXJzIjogc2V0KFsibW9jay1zcGVjaWZpZXIiXSl9 fQotICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydlY2hvJywg J3JlYmFzZWxpbmUtdGVzdCcsICdNT0NLIGJ1aWxkZXInLCAndXNlci1zY3JpcHRzL2Fub3RoZXIt dGVzdC5odG1sJ10sIGN3ZD0vbW9jay1jaGVja291dFxuIgorICAgICAgICBleHBlY3RlZF9zdGRl cnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdCcsICctLXN1 ZmZpeGVzJywgJ3R4dCxwbmcnLCAnTU9DSyBidWlsZGVyJywgJ3VzZXItc2NyaXB0cy9hbm90aGVy LXRlc3QuaHRtbCddLCBjd2Q9L21vY2stY2hlY2tvdXRcbiIKICAgICAgICAgZXhwZWN0ZWRfc3Rk b3V0ID0gIj09IEJlZ2luIFJlc3BvbnNlID09XG5zdWNjZXNzXG49PSBFbmQgUmVzcG9uc2UgPT1c biIKLSAgICAgICAgc2VsZi5fcG9zdF90b19wYXRoKCIvcmViYXNlbGluZT9idWlsZGVyPU1PQ0sr YnVpbGRlciZ0ZXN0PXVzZXItc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCIsIGV4cGVjdGVkX3N0 ZGVycj1leHBlY3RlZF9zdGRlcnIsIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQpCisg ICAgICAgIHNlbGYuX3Bvc3RfdG9fcGF0aCgiL3JlYmFzZWxpbmU/YnVpbGRlcj1NT0NLK2J1aWxk ZXImdGVzdD11c2VyLXNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwmc3VmZml4ZXM9dHh0LHBuZyIs IGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIsIGV4cGVjdGVkX3N0ZG91dD1leHBlY3Rl ZF9zdGRvdXQpCiAKICAgICBkZWYgdGVzdF9yZWJhc2VsaW5lX25ld19wb3J0KHNlbGYpOgogICAg ICAgICBidWlsZGVycy5fZXhhY3RfbWF0Y2hlcyA9IHsiTU9DSyBidWlsZGVyIjogeyJwb3J0X25h bWUiOiAibW9jay1wb3J0LW5hbWUiLCAic3BlY2lmaWVycyI6IHNldChbIm1vY2stc3BlY2lmaWVy Il0pLCAibW92ZV9vdmVyd3JpdHRlbl9iYXNlbGluZXNfdG8iOiBbIm1vY2stcG9ydC1mYWxsYmFj ayIsICJtb2NrLXBvcnQtZmFsbGJhY2syIl19fQotICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAi TU9DSyBydW5fY29tbWFuZDogWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdCcsICdNT0NLIGJ1aWxk ZXInLCAndXNlci1zY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sJywgJ21vY2stcG9ydC1mYWxsYmFj aycsICdtb2NrLXBvcnQtZmFsbGJhY2syJ10sIGN3ZD0vbW9jay1jaGVja291dFxuIgorICAgICAg ICBleHBlY3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29tbWFuZDogWydlY2hvJywgJ3JlYmFzZWxp bmUtdGVzdCcsICctLXN1ZmZpeGVzJywgJ3R4dCxwbmcnLCAnTU9DSyBidWlsZGVyJywgJ3VzZXIt c2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCcsICdtb2NrLXBvcnQtZmFsbGJhY2snLCAnbW9jay1w b3J0LWZhbGxiYWNrMiddLCBjd2Q9L21vY2stY2hlY2tvdXRcbiIKICAgICAgICAgZXhwZWN0ZWRf c3Rkb3V0ID0gIj09IEJlZ2luIFJlc3BvbnNlID09XG5zdWNjZXNzXG49PSBFbmQgUmVzcG9uc2Ug PT1cbiIKLSAgICAgICAgc2VsZi5fcG9zdF90b19wYXRoKCIvcmViYXNlbGluZT9idWlsZGVyPU1P Q0srYnVpbGRlciZ0ZXN0PXVzZXItc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCIsIGV4cGVjdGVk X3N0ZGVycj1leHBlY3RlZF9zdGRlcnIsIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQp CisgICAgICAgIHNlbGYuX3Bvc3RfdG9fcGF0aCgiL3JlYmFzZWxpbmU/YnVpbGRlcj1NT0NLK2J1 aWxkZXImdGVzdD11c2VyLXNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwmc3VmZml4ZXM9dHh0LHBu ZyIsIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIsIGV4cGVjdGVkX3N0ZG91dD1leHBl Y3RlZF9zdGRvdXQpCiAKICAgICBkZWYgdGVzdF9vcHRpbWl6ZWJhc2VsaW5lcyhzZWxmKToKLSAg ICAgICAgZXhwZWN0ZWRfc3RkZXJyID0gIk1PQ0sgcnVuX2NvbW1hbmQ6IFsnZWNobycsICdvcHRp bWl6ZS1iYXNlbGluZXMnLCAndXNlci1zY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sJ10sIGN3ZD0v bW9jay1jaGVja291dFxuIgorICAgICAgICBleHBlY3RlZF9zdGRlcnIgPSAiTU9DSyBydW5fY29t bWFuZDogWydlY2hvJywgJ29wdGltaXplLWJhc2VsaW5lcycsICctLXN1ZmZpeGVzJywgJ3R4dCxw bmcnLCAndXNlci1zY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sJ10sIGN3ZD0vbW9jay1jaGVja291 dFxuIgogICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAiPT0gQmVnaW4gUmVzcG9uc2UgPT1cbnN1 Y2Nlc3Ncbj09IEVuZCBSZXNwb25zZSA9PVxuIgotICAgICAgICBzZWxmLl9wb3N0X3RvX3BhdGgo Ii9vcHRpbWl6ZWJhc2VsaW5lcz90ZXN0PXVzZXItc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCIs IGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnIsIGV4cGVjdGVkX3N0ZG91dD1leHBlY3Rl ZF9zdGRvdXQpCisgICAgICAgIHNlbGYuX3Bvc3RfdG9fcGF0aCgiL29wdGltaXplYmFzZWxpbmVz P3Rlc3Q9dXNlci1zY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sJnN1ZmZpeGVzPXR4dCxwbmciLCBl eHBlY3RlZF9zdGRlcnI9ZXhwZWN0ZWRfc3RkZXJyLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRf c3Rkb3V0KQogCiAgICAgZGVmIHRlc3RfdXBkYXRlZXhwZWN0YXRpb25zKHNlbGYpOgogICAgICAg ICBleHBlY3RlZF9zdGRlcnIgPSAiIgo=