31758 2009-11-20 18:47:02 -0800 Fix a bunch of unit test regressions from our recent bugzilla-toll hacking 2020-09-07 02:07:39 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric webkit-unassigned abarth raekairick2010 oldest_to_newest 165535 0 eric 2009-11-20 18:47:02 -0800 Fix a bunch of unit test regressions from our recent bugzilla-toll hacking 165536 1 43635 eric 2009-11-20 18:52:30 -0800 Created attachment 43635 Patch 165544 2 43638 eric 2009-11-20 19:10:35 -0800 Created attachment 43638 Patch updated to apply cleanly on TOT 165545 3 43639 eric 2009-11-20 19:12:02 -0800 Created attachment 43639 Patch updated to apply cleanly on TOT 165554 4 43639 abarth 2009-11-20 19:31:39 -0800 Comment on attachment 43639 Patch updated to apply cleanly on TOT Thanks! 165556 5 43639 abarth 2009-11-20 19:53:37 -0800 Comment on attachment 43639 Patch updated to apply cleanly on TOT Clearing flags on attachment: 43639 Committed r51277: <http://trac.webkit.org/changeset/51277> 165557 6 abarth 2009-11-20 19:53:42 -0800 All reviewed patches have been landed. Closing bug. 43635 2009-11-20 18:52:30 -0800 2009-11-20 19:07:54 -0800 Patch bug-31758-20091120185229.patch text/plain 8290 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5YzZiMDgwLi4xZTAzZjViIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMDktMTEt MjAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBhIGJ1bmNoIG9mIHVuaXQgdGVzdCByZWdy ZXNzaW9ucyBmcm9tIG91ciByZWNlbnQgYnVnemlsbGEtdG9sbCBoYWNraW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTc1OAorCisgICAgICAgICog U2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHk6CisgICAgICAgICAtIEFsbG93IHBh c3Npbmcgb2YgZXhwbGljaXQgY29tbWFuZHMgdG8gTXVsdGlDb21tYW5kVG9vbC5fX2luaXRfXwor ICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1hbmR0b29sX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAgLSBVc2UgbmV3IENvbW1hbmQubmFtZSBuYW1pbmcgc3lzdGVtLgorICAgICAgICAg LSBUZXN0IENvbW1hbmQgYXV0by1kaXNjb3ZlcnkuCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVz L3dvcmtxdWV1ZS5weToKKyAgICAgICAgIC0gYnVnX2lkIG5vIGxvbmdlciBleGlzdHMsIHVzZSBw YXRjaFsnYnVnX2lkJ10gaW5zdGVhZC4KKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvd29ya3F1 ZXVlX3VuaXR0ZXN0LnB5OgorICAgICAgICAgLSBXb3JrUXVldWVzIHJlcXVpcmUgbmFtZXMgbm93 LgorICAgICAgICAgLSBzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbSBtdXN0IHJldHVybiBh IHBhdGNoIG9iamVjdC4KKworMjAwOS0xMS0yMCAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5v cmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICBUZWFjaCB0 aGUgU3RhdHVzQm90IGhvdyB0byBzdXBwb3J0IG1vcmUgdGhhbiBqdXN0IHRoZSBjb21taXQtcXVl dWUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1hbmR0 b29sLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHkK aW5kZXggNTY5MjQwNC4uZmUzYzJkNCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL211bHRpY29tbWFuZHRvb2wucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1 bGVzL211bHRpY29tbWFuZHRvb2wucHkKQEAgLTc3LDggKzc3LDkgQEAgY2xhc3MgSGVscFByaW50 aW5nT3B0aW9uUGFyc2VyKE9wdGlvblBhcnNlcik6CiAKIAogY2xhc3MgTXVsdGlDb21tYW5kVG9v bChvYmplY3QpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgc2VsZi5jb21tYW5k cyA9IFtjbHMoKSBmb3IgY2xzIGluIHNlbGYuX2ZpbmRfYWxsX2NvbW1hbmRzKCkgaWYgY2xzLm5h bWVdCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGNvbW1hbmRzPU5vbmUpOgorICAgICAgICAjIEFs bG93IHRoZSB1bml0IHRlc3RzIHRvIGRpc2FibGUgY29tbWFuZCBhdXRvLWRpc2NvdmVyeS4KKyAg ICAgICAgc2VsZi5jb21tYW5kcyA9IGNvbW1hbmRzIG9yIFtjbHMoKSBmb3IgY2xzIGluIHNlbGYu X2ZpbmRfYWxsX2NvbW1hbmRzKCkgaWYgY2xzLm5hbWVdCiAgICAgICAgICMgRklYTUU6IENhbGxp bmcgc2VsZi5fY29tbWFuZHNfdXNhZ2UoKSBpbiB0aGUgY29uc3RydWN0b3IgaXMgYmFkIGJlY2F1 c2UKICAgICAgICAgIyBpdCBjYWxscyBzZWxmLnNob3VsZF9zaG93X2NvbW1hbmRfaGVscCB3aGlj aCBpcyBzdWJjbGFzcy1kZWZpbmVkLgogICAgICAgICAjIFRoZSBzdWJjbGFzcyB3aWxsIG5vdCBi ZSBmdWxseSBpbml0aWFsaXplZCBhdCB0aGlzIHBvaW50LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2xfdW5pdHRlc3QucHkgYi9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvbXVsdGljb21tYW5kdG9vbF91bml0dGVzdC5weQppbmRleCA0 OWZjNzFlLi4zM2NmZGYyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv bXVsdGljb21tYW5kdG9vbF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21v ZHVsZXMvbXVsdGljb21tYW5kdG9vbF91bml0dGVzdC5weQpAQCAtMzQsNiArMzQsNyBAQCBmcm9t IFN0cmluZ0lPIGltcG9ydCBTdHJpbmdJTwogZnJvbSBvcHRwYXJzZSBpbXBvcnQgbWFrZV9vcHRp b24KIAogY2xhc3MgVHJpdmlhbENvbW1hbmQoQ29tbWFuZCk6CisgICAgbmFtZSA9ICJ0cml2aWFs IgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CiAgICAgICAgIENvbW1hbmQuX19p bml0X18oc2VsZiwgImhlbHAgdGV4dCIsICoqa3dhcmdzKQogCkBAIC00NCwxNCArNDUsMTQgQEAg Y2xhc3MgVHJpdmlhbENvbW1hbmQoQ29tbWFuZCk6CiBjbGFzcyBDb21tYW5kVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfbmFtZV93aXRoX2FyZ3VtZW50cyhzZWxmKToKICAg ICAgICAgY29tbWFuZF93aXRoX2FyZ3MgPSBUcml2aWFsQ29tbWFuZChhcmd1bWVudF9uYW1lcz0i QVJHMSBBUkcyIikKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21tYW5kX3dpdGhfYXJncy5u YW1lX3dpdGhfYXJndW1lbnRzKCJzaW1wbGUiKSwgInNpbXBsZSBBUkcxIEFSRzIiKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGNvbW1hbmRfd2l0aF9hcmdzLm5hbWVfd2l0aF9hcmd1bWVudHMo KSwgInRyaXZpYWwgQVJHMSBBUkcyIikKIAogICAgICAgICBjb21tYW5kX3dpdGhfYXJncyA9IFRy aXZpYWxDb21tYW5kKG9wdGlvbnM9W21ha2Vfb3B0aW9uKCItLW15X29wdGlvbiIpXSkKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChjb21tYW5kX3dpdGhfYXJncy5uYW1lX3dpdGhfYXJndW1lbnRz KCJzaW1wbGUiKSwgInNpbXBsZSBbb3B0aW9uc10iKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGNvbW1hbmRfd2l0aF9hcmdzLm5hbWVfd2l0aF9hcmd1bWVudHMoKSwgInRyaXZpYWwgW29wdGlv bnNdIikKIAogCiBjbGFzcyBUcml2aWFsVG9vbChNdWx0aUNvbW1hbmRUb29sKToKLSAgICBkZWYg X19pbml0X18oc2VsZiwgY29tbWFuZHMpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBjb21tYW5k cz1Ob25lKToKICAgICAgICAgTXVsdGlDb21tYW5kVG9vbC5fX2luaXRfXyhzZWxmLCBjb21tYW5k cykKIAogICAgIGRlZiBzaG91bGRfc2hvd19jb21tYW5kX2hlbHAoc2VsZiwgY29tbWFuZCk6CkBA IC02Miw3ICs2Myw2IEBAIGNsYXNzIFRyaXZpYWxUb29sKE11bHRpQ29tbWFuZFRvb2wpOgogCiAK IGNsYXNzIE11bHRpQ29tbWFuZFRvb2xUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKLQogICAgIGRl ZiBfY2FwdHVyZV9zdGRlcnIoc2VsZik6CiAgICAgICAgIHNlbGYuc2F2ZWRfc3RkZXJyID0gc3lz LnN0ZGVycgogICAgICAgICBzeXMuc3RkZXJyID0gU3RyaW5nSU8oKQpAQCAtOTEsMjEgKzkxLDE5 IEBAIGNsYXNzIE11bHRpQ29tbWFuZFRvb2xUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAg ICAgc2VsZi5fYXNzZXJ0X3NwbGl0KGZ1bGxfYXJncywgZnVsbF9hcmdzX2V4cGVjdGVkKQogCiAg ICAgZGVmIHRlc3RfY29tbWFuZF9ieV9uYW1lKHNlbGYpOgotICAgICAgICBmb29fY29tbWFuZCA9 IHsgIm5hbWUiIDogImZvb19jb21tYW5kIiwgIm9iamVjdCIgOiAgVHJpdmlhbENvbW1hbmQoKSB9 Ci0gICAgICAgIHRvb2wgPSBUcml2aWFsVG9vbChbZm9vX2NvbW1hbmRdKQotCi0gICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwodG9vbC5jb21tYW5kX2J5X25hbWUoImZvb19jb21tYW5kIiksIGZvb19j b21tYW5kKQorICAgICAgICAjIFRoaXMgYWxzbyB0ZXN0cyBDb21tYW5kIGF1dG8tZGlzY292ZXJ5 LgorICAgICAgICB0b29sID0gVHJpdmlhbFRvb2woKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHRvb2wuY29tbWFuZF9ieV9uYW1lKCJ0cml2aWFsIikubmFtZSwgInRyaXZpYWwiKQogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHRvb2wuY29tbWFuZF9ieV9uYW1lKCJiYXIiKSwgTm9uZSkKIAog ICAgIGRlZiB0ZXN0X2NvbW1hbmRfaGVscChzZWxmKToKLSAgICAgICAgY29tbWFuZF93aXRoX2Fy Z3MgPSBUcml2aWFsQ29tbWFuZChvcHRpb25zPVttYWtlX29wdGlvbigiLS1teV9vcHRpb24iKV0p Ci0gICAgICAgIGZvb19jb21tYW5kID0geyAibmFtZSIgOiAiZm9vX2NvbW1hbmQiLCAib2JqZWN0 IiA6ICBjb21tYW5kX3dpdGhfYXJncyB9Ci0gICAgICAgIHRvb2wgPSBUcml2aWFsVG9vbChbZm9v X2NvbW1hbmRdKQorICAgICAgICBjb21tYW5kX3dpdGhfb3B0aW9ucyA9IFRyaXZpYWxDb21tYW5k KG9wdGlvbnM9W21ha2Vfb3B0aW9uKCItLW15X29wdGlvbiIpXSkKKyAgICAgICAgdG9vbCA9IFRy aXZpYWxUb29sKGNvbW1hbmRzPVtjb21tYW5kX3dpdGhfb3B0aW9uc10pCiAKICAgICAgICAgc2Vs Zi5fY2FwdHVyZV9zdGRlcnIoKQotICAgICAgICBleGl0X2NvZGUgPSB0b29sLm1haW4oWyJ0b29s IiwgImhlbHAiLCAiZm9vX2NvbW1hbmQiXSkKKyAgICAgICAgZXhpdF9jb2RlID0gdG9vbC5tYWlu KFsidG9vbCIsICJoZWxwIiwgInRyaXZpYWwiXSkKICAgICAgICAgaGVscF90ZXh0ID0gc2VsZi5f cmVsZWFzZV9zdGRlcnIoKQotICAgICAgICBleHBlY3RlZF9zdWJjb21tYW5kX2hlbHAgPSAiICBm b29fY29tbWFuZCBbb3B0aW9uc10gICBoZWxwIHRleHRcbk9wdGlvbnM6XG4gIC0tbXlfb3B0aW9u PU1ZX09QVElPTlxuXG4iCisgICAgICAgIGV4cGVjdGVkX3N1YmNvbW1hbmRfaGVscCA9ICIgIHRy aXZpYWwgW29wdGlvbnNdICAgaGVscCB0ZXh0XG5PcHRpb25zOlxuICAtLW15X29wdGlvbj1NWV9P UFRJT05cblxuIgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4aXRfY29kZSwgMCkKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChoZWxwX3RleHQsIGV4cGVjdGVkX3N1YmNvbW1hbmRfaGVscCkK IApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZS5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVldWUucHkKaW5kZXggOTk3YzhiNy4u MzI2NGJjZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1 ZS5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlLnB5CkBAIC0x MDksNyArMTA5LDggQEAgY2xhc3MgV29ya1F1ZXVlOgogICAgICAgICAgICAgICAgIHNlbGYuX3Ns ZWVwKCJFeGNlcHRpb24gd2hpbGUgcHJlcGFyaW5nIHF1ZXVlOiAlcy4iICUgZSkKICAgICAgICAg ICAgICAgICBjb250aW51ZQogCi0gICAgICAgICAgICBzZWxmLl9vcGVuX3dvcmtfbG9nKGJ1Z19p ZCkKKyAgICAgICAgICAgICMgRklYTUU6IFdvcmsgbG9ncyBzaG91bGQgbm90IGRlcGVuZCBvbiBi dWdfaWQgc3BlY2lmaWNhbHkuCisgICAgICAgICAgICBzZWxmLl9vcGVuX3dvcmtfbG9nKHBhdGNo WyJidWdfaWQiXSkKICAgICAgICAgICAgIHRyeToKICAgICAgICAgICAgICAgICBzZWxmLl9kZWxl Z2F0ZS5wcm9jZXNzX3dvcmtfaXRlbSh3b3JrX2l0ZW0pCiAgICAgICAgICAgICBleGNlcHQgU2Ny aXB0RXJyb3IsIGU6CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvd29y a3F1ZXVlX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1 ZV91bml0dGVzdC5weQppbmRleCAzNDI4YWNjLi4xZTljOGFkIDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvd29ya3F1ZXVlX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVldWVfdW5pdHRlc3QucHkKQEAgLTg1LDcgKzg1LDgg QEAgY2xhc3MgTG9nZ2luZ0RlbGVnYXRlKFdvcmtRdWV1ZURlbGVnYXRlKToKICAgICBkZWYgc2hv dWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0oc2VsZiwgd29ya19pdGVtKToKICAgICAgICAgc2Vs Zi5yZWNvcmQoInNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtIikKICAgICAgICAgc2VsZi5f dGVzdC5hc3NlcnRFcXVhbHMod29ya19pdGVtLCAid29ya19pdGVtIikKLSAgICAgICAgcmV0dXJu IChUcnVlLCAid2FpdGluZ19tZXNzYWdlIiwgNDIpCisgICAgICAgIGZha2VfcGF0Y2ggPSB7ICdi dWdfaWQnIDogNDIgfQorICAgICAgICByZXR1cm4gKFRydWUsICJ3YWl0aW5nX21lc3NhZ2UiLCBm YWtlX3BhdGNoKQogCiAgICAgZGVmIHByb2Nlc3Nfd29ya19pdGVtKHNlbGYsIHdvcmtfaXRlbSk6 CiAgICAgICAgIHNlbGYucmVjb3JkKCJwcm9jZXNzX3dvcmtfaXRlbSIpCkBAIC0xMTAsMTIgKzEx MSwxMyBAQCBjbGFzcyBOb3RTYWZlVG9Qcm9jZWVkRGVsZWdhdGUoTG9nZ2luZ0RlbGVnYXRlKToK ICAgICBkZWYgc2hvdWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0oc2VsZiwgd29ya19pdGVtKToK ICAgICAgICAgc2VsZi5yZWNvcmQoInNob3VsZF9wcm9jZWVkX3dpdGhfd29ya19pdGVtIikKICAg ICAgICAgc2VsZi5fdGVzdC5hc3NlcnRFcXVhbHMod29ya19pdGVtLCAid29ya19pdGVtIikKLSAg ICAgICAgcmV0dXJuIChGYWxzZSwgIndhaXRpbmdfbWVzc2FnZSIsIDQyKQorICAgICAgICBmYWtl X3BhdGNoID0geyAnYnVnX2lkJyA6IDQyIH0KKyAgICAgICAgcmV0dXJuIChGYWxzZSwgIndhaXRp bmdfbWVzc2FnZSIsIGZha2VfcGF0Y2gpCiAKIAogY2xhc3MgRmFzdFdvcmtRdWV1ZShXb3JrUXVl dWUpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBkZWxlZ2F0ZSk6Ci0gICAgICAgIFdvcmtRdWV1 ZS5fX2luaXRfXyhzZWxmLCBkZWxlZ2F0ZSkKKyAgICAgICAgV29ya1F1ZXVlLl9faW5pdF9fKHNl bGYsICJmYXN0LXF1ZXVlIiwgZGVsZWdhdGUpCiAKICAgICAjIE5vIHNsZWVwIGZvciB0aGUgd2lj a2VkLgogICAgIHNlY29uZHNfdG9fc2xlZXAgPSAwCkBAIC0xMjcsNyArMTI5LDcgQEAgY2xhc3Mg RmFzdFdvcmtRdWV1ZShXb3JrUXVldWUpOgogY2xhc3MgV29ya1F1ZXVlVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfdHJpdmlhbChzZWxmKToKICAgICAgICAgZGVsZWdhdGUg PSBMb2dnaW5nRGVsZWdhdGUoc2VsZikKLSAgICAgICAgd29ya19xdWV1ZSA9IFdvcmtRdWV1ZShk ZWxlZ2F0ZSkKKyAgICAgICAgd29ya19xdWV1ZSA9IFdvcmtRdWV1ZSgidHJpdmlhbC1xdWV1ZSIs IGRlbGVnYXRlKQogICAgICAgICB3b3JrX3F1ZXVlLnJ1bigpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWxzKGRlbGVnYXRlLl9jYWxsYmFja3MsIExvZ2dpbmdEZWxlZ2F0ZS5leHBlY3RlZF9jYWxs YmFja3MpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShvcy5wYXRoLmV4aXN0cyhkZWxlZ2F0ZS5x dWV1ZV9sb2dfcGF0aCgpKSkKQEAgLTEzNSw3ICsxMzcsNyBAQCBjbGFzcyBXb3JrUXVldWVUZXN0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X3VuZXhwZWN0ZWRfZXJyb3Ioc2Vs Zik6CiAgICAgICAgIGRlbGVnYXRlID0gVGhyb3dFcnJvckRlbGVnYXRlKHNlbGYsIDMpCi0gICAg ICAgIHdvcmtfcXVldWUgPSBXb3JrUXVldWUoZGVsZWdhdGUpCisgICAgICAgIHdvcmtfcXVldWUg PSBXb3JrUXVldWUoImVycm9yLXF1ZXVlIiwgZGVsZWdhdGUpCiAgICAgICAgIHdvcmtfcXVldWUu cnVuKCkKICAgICAgICAgZXhwZWN0ZWRfY2FsbGJhY2tzID0gTG9nZ2luZ0RlbGVnYXRlLmV4cGVj dGVkX2NhbGxiYWNrc1s6XQogICAgICAgICB3b3JrX2l0ZW1faW5kZXggPSBleHBlY3RlZF9jYWxs YmFja3MuaW5kZXgoJ3Byb2Nlc3Nfd29ya19pdGVtJykKQEAgLTE0Niw3ICsxNDgsNyBAQCBjbGFz cyBXb3JrUXVldWVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgIGRlZiB0ZXN0X2hhbmRs ZWRfZXJyb3Ioc2VsZik6CiAgICAgICAgIGRlbGVnYXRlID0gVGhyb3dFcnJvckRlbGVnYXRlKHNl bGYsIFdvcmtRdWV1ZS5oYW5kbGVkX2Vycm9yX2NvZGUpCi0gICAgICAgIHdvcmtfcXVldWUgPSBX b3JrUXVldWUoZGVsZWdhdGUpCisgICAgICAgIHdvcmtfcXVldWUgPSBXb3JrUXVldWUoImhhbmRs ZWQtZXJyb3ItcXVldWUiLCBkZWxlZ2F0ZSkKICAgICAgICAgd29ya19xdWV1ZS5ydW4oKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhkZWxlZ2F0ZS5fY2FsbGJhY2tzLCBMb2dnaW5nRGVsZWdh dGUuZXhwZWN0ZWRfY2FsbGJhY2tzKQogCg== 43638 2009-11-20 19:10:35 -0800 2009-11-20 19:11:52 -0800 Patch updated to apply cleanly on TOT bug-31758-20091120191033.patch text/plain 674 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weSBiL1dl YktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQppbmRleCAwODRjMWMzLi5jMWEx MmIxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxhLnB5CkBAIC0zNzcsNyAr Mzc3LDcgQEAgY2xhc3MgQnVnemlsbGE6CiAgICAgICAgIGlmIHNlbGYuZHJ5cnVuOgogICAgICAg ICAgICAgbG9nKGNvbW1lbnRfdGV4dCkKICAgICAgICAgICAgIHJldHVybgotICAgICAgICAKKyAg ICAgICAgcHJpbnQgIkZPTyIKICAgICAgICAgc2VsZi5icm93c2VyLm9wZW4oIiVzYXR0YWNobWVu dC5jZ2k/YWN0aW9uPWVudGVyJmJ1Z2lkPSVzIiAlIChzZWxmLmJ1Z19zZXJ2ZXJfdXJsLCBidWdf aWQpKQogICAgICAgICBzZWxmLmJyb3dzZXIuc2VsZWN0X2Zvcm0obmFtZT0iZW50cnlmb3JtIikK ICAgICAgICAgc2VsZi5fZmlsbF9hdHRhY2htZW50X2Zvcm0oZGVzY3JpcHRpb24sIHBhdGNoX2Zp bGVfb2JqZWN0LCBtYXJrX2Zvcl9yZXZpZXc9bWFya19mb3JfcmV2aWV3LCBtYXJrX2Zvcl9jb21t aXRfcXVldWU9bWFya19mb3JfY29tbWl0X3F1ZXVlLCBidWdfaWQ9YnVnX2lkKQo= 43639 2009-11-20 19:12:02 -0800 2009-11-20 19:53:36 -0800 Patch updated to apply cleanly on TOT bug-31758-20091120191200.patch text/plain 8868 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA5YjdhYzMwLi5mNzY1Zjc5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAKIDIwMDktMTEt MjAgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBhIGJ1bmNoIG9mIHVuaXQgdGVzdCByZWdy ZXNzaW9ucyBmcm9tIG91ciByZWNlbnQgYnVnemlsbGEtdG9sbCBoYWNraW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTc1OAorCisgICAgICAgICog U2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2wucHk6CisgICAgICAgICAtIEFsbG93IHBh c3Npbmcgb2YgZXhwbGljaXQgY29tbWFuZHMgdG8gTXVsdGlDb21tYW5kVG9vbC5fX2luaXRfXwor ICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1hbmR0b29sX3VuaXR0ZXN0LnB5Ogor ICAgICAgICAgLSBVc2UgbmV3IENvbW1hbmQubmFtZSBuYW1pbmcgc3lzdGVtLgorICAgICAgICAg LSBUZXN0IENvbW1hbmQgYXV0by1kaXNjb3ZlcnkuCisgICAgICAgICogU2NyaXB0cy9tb2R1bGVz L3dvcmtxdWV1ZS5weToKKyAgICAgICAgIC0gYnVnX2lkIG5vIGxvbmdlciBleGlzdHMsIHVzZSBw YXRjaFsnYnVnX2lkJ10gaW5zdGVhZC4KKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvd29ya3F1 ZXVlX3VuaXR0ZXN0LnB5OgorICAgICAgICAgLSBXb3JrUXVldWVzIHJlcXVpcmUgbmFtZXMgbm93 LgorICAgICAgICAgLSBzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbSBtdXN0IHJldHVybiBh IHBhdGNoIG9iamVjdC4KKworMjAwOS0xMS0yMCAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5v cmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICBUZWFjaCB0 aGUgU3RhdHVzQm90IGhvdyB0byBzdXBwb3J0IG1vcmUgdGhhbiBqdXN0IHRoZSBjb21taXQtcXVl dWUKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9idWd6aWxsYS5weQppbmRleCAwODRjMWMzLi5l NjYzMzk4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvYnVnemlsbGEu cHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL2J1Z3ppbGxhLnB5CkBAIC0zNzcs NyArMzc3LDcgQEAgY2xhc3MgQnVnemlsbGE6CiAgICAgICAgIGlmIHNlbGYuZHJ5cnVuOgogICAg ICAgICAgICAgbG9nKGNvbW1lbnRfdGV4dCkKICAgICAgICAgICAgIHJldHVybgotICAgICAgICAK KwogICAgICAgICBzZWxmLmJyb3dzZXIub3BlbigiJXNhdHRhY2htZW50LmNnaT9hY3Rpb249ZW50 ZXImYnVnaWQ9JXMiICUgKHNlbGYuYnVnX3NlcnZlcl91cmwsIGJ1Z19pZCkpCiAgICAgICAgIHNl bGYuYnJvd3Nlci5zZWxlY3RfZm9ybShuYW1lPSJlbnRyeWZvcm0iKQogICAgICAgICBzZWxmLl9m aWxsX2F0dGFjaG1lbnRfZm9ybShkZXNjcmlwdGlvbiwgcGF0Y2hfZmlsZV9vYmplY3QsIG1hcmtf Zm9yX3Jldmlldz1tYXJrX2Zvcl9yZXZpZXcsIG1hcmtfZm9yX2NvbW1pdF9xdWV1ZT1tYXJrX2Zv cl9jb21taXRfcXVldWUsIGJ1Z19pZD1idWdfaWQpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9T Y3JpcHRzL21vZHVsZXMvbXVsdGljb21tYW5kdG9vbC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv bW9kdWxlcy9tdWx0aWNvbW1hbmR0b29sLnB5CmluZGV4IDU2OTI0MDQuLmZlM2MyZDQgMTAwNjQ0 Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1hbmR0b29sLnB5Cisr KyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1hbmR0b29sLnB5CkBAIC03 Nyw4ICs3Nyw5IEBAIGNsYXNzIEhlbHBQcmludGluZ09wdGlvblBhcnNlcihPcHRpb25QYXJzZXIp OgogCiAKIGNsYXNzIE11bHRpQ29tbWFuZFRvb2wob2JqZWN0KToKLSAgICBkZWYgX19pbml0X18o c2VsZik6Ci0gICAgICAgIHNlbGYuY29tbWFuZHMgPSBbY2xzKCkgZm9yIGNscyBpbiBzZWxmLl9m aW5kX2FsbF9jb21tYW5kcygpIGlmIGNscy5uYW1lXQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBj b21tYW5kcz1Ob25lKToKKyAgICAgICAgIyBBbGxvdyB0aGUgdW5pdCB0ZXN0cyB0byBkaXNhYmxl IGNvbW1hbmQgYXV0by1kaXNjb3ZlcnkuCisgICAgICAgIHNlbGYuY29tbWFuZHMgPSBjb21tYW5k cyBvciBbY2xzKCkgZm9yIGNscyBpbiBzZWxmLl9maW5kX2FsbF9jb21tYW5kcygpIGlmIGNscy5u YW1lXQogICAgICAgICAjIEZJWE1FOiBDYWxsaW5nIHNlbGYuX2NvbW1hbmRzX3VzYWdlKCkgaW4g dGhlIGNvbnN0cnVjdG9yIGlzIGJhZCBiZWNhdXNlCiAgICAgICAgICMgaXQgY2FsbHMgc2VsZi5z aG91bGRfc2hvd19jb21tYW5kX2hlbHAgd2hpY2ggaXMgc3ViY2xhc3MtZGVmaW5lZC4KICAgICAg ICAgIyBUaGUgc3ViY2xhc3Mgd2lsbCBub3QgYmUgZnVsbHkgaW5pdGlhbGl6ZWQgYXQgdGhpcyBw b2ludC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9tdWx0aWNvbW1h bmR0b29sX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29t bWFuZHRvb2xfdW5pdHRlc3QucHkKaW5kZXggNDlmYzcxZS4uMzNjZmRmMiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2xfdW5pdHRlc3QucHkK KysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL211bHRpY29tbWFuZHRvb2xfdW5pdHRl c3QucHkKQEAgLTM0LDYgKzM0LDcgQEAgZnJvbSBTdHJpbmdJTyBpbXBvcnQgU3RyaW5nSU8KIGZy b20gb3B0cGFyc2UgaW1wb3J0IG1ha2Vfb3B0aW9uCiAKIGNsYXNzIFRyaXZpYWxDb21tYW5kKENv bW1hbmQpOgorICAgIG5hbWUgPSAidHJpdmlhbCIKICAgICBkZWYgX19pbml0X18oc2VsZiwgKipr d2FyZ3MpOgogICAgICAgICBDb21tYW5kLl9faW5pdF9fKHNlbGYsICJoZWxwIHRleHQiLCAqKmt3 YXJncykKIApAQCAtNDQsMTQgKzQ1LDE0IEBAIGNsYXNzIFRyaXZpYWxDb21tYW5kKENvbW1hbmQp OgogY2xhc3MgQ29tbWFuZFRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X25h bWVfd2l0aF9hcmd1bWVudHMoc2VsZik6CiAgICAgICAgIGNvbW1hbmRfd2l0aF9hcmdzID0gVHJp dmlhbENvbW1hbmQoYXJndW1lbnRfbmFtZXM9IkFSRzEgQVJHMiIpCi0gICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoY29tbWFuZF93aXRoX2FyZ3MubmFtZV93aXRoX2FyZ3VtZW50cygic2ltcGxlIiks ICJzaW1wbGUgQVJHMSBBUkcyIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21tYW5kX3dp dGhfYXJncy5uYW1lX3dpdGhfYXJndW1lbnRzKCksICJ0cml2aWFsIEFSRzEgQVJHMiIpCiAKICAg ICAgICAgY29tbWFuZF93aXRoX2FyZ3MgPSBUcml2aWFsQ29tbWFuZChvcHRpb25zPVttYWtlX29w dGlvbigiLS1teV9vcHRpb24iKV0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY29tbWFuZF93 aXRoX2FyZ3MubmFtZV93aXRoX2FyZ3VtZW50cygic2ltcGxlIiksICJzaW1wbGUgW29wdGlvbnNd IikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjb21tYW5kX3dpdGhfYXJncy5uYW1lX3dpdGhf YXJndW1lbnRzKCksICJ0cml2aWFsIFtvcHRpb25zXSIpCiAKIAogY2xhc3MgVHJpdmlhbFRvb2wo TXVsdGlDb21tYW5kVG9vbCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIGNvbW1hbmRzKToKKyAg ICBkZWYgX19pbml0X18oc2VsZiwgY29tbWFuZHM9Tm9uZSk6CiAgICAgICAgIE11bHRpQ29tbWFu ZFRvb2wuX19pbml0X18oc2VsZiwgY29tbWFuZHMpCiAKICAgICBkZWYgc2hvdWxkX3Nob3dfY29t bWFuZF9oZWxwKHNlbGYsIGNvbW1hbmQpOgpAQCAtNjIsNyArNjMsNiBAQCBjbGFzcyBUcml2aWFs VG9vbChNdWx0aUNvbW1hbmRUb29sKToKIAogCiBjbGFzcyBNdWx0aUNvbW1hbmRUb29sVGVzdCh1 bml0dGVzdC5UZXN0Q2FzZSk6Ci0KICAgICBkZWYgX2NhcHR1cmVfc3RkZXJyKHNlbGYpOgogICAg ICAgICBzZWxmLnNhdmVkX3N0ZGVyciA9IHN5cy5zdGRlcnIKICAgICAgICAgc3lzLnN0ZGVyciA9 IFN0cmluZ0lPKCkKQEAgLTkxLDIxICs5MSwxOSBAQCBjbGFzcyBNdWx0aUNvbW1hbmRUb29sVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuX2Fzc2VydF9zcGxpdChmdWxsX2Fy Z3MsIGZ1bGxfYXJnc19leHBlY3RlZCkKIAogICAgIGRlZiB0ZXN0X2NvbW1hbmRfYnlfbmFtZShz ZWxmKToKLSAgICAgICAgZm9vX2NvbW1hbmQgPSB7ICJuYW1lIiA6ICJmb29fY29tbWFuZCIsICJv YmplY3QiIDogIFRyaXZpYWxDb21tYW5kKCkgfQotICAgICAgICB0b29sID0gVHJpdmlhbFRvb2wo W2Zvb19jb21tYW5kXSkKLQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRvb2wuY29tbWFuZF9i eV9uYW1lKCJmb29fY29tbWFuZCIpLCBmb29fY29tbWFuZCkKKyAgICAgICAgIyBUaGlzIGFsc28g dGVzdHMgQ29tbWFuZCBhdXRvLWRpc2NvdmVyeS4KKyAgICAgICAgdG9vbCA9IFRyaXZpYWxUb29s KCkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh0b29sLmNvbW1hbmRfYnlfbmFtZSgidHJpdmlh bCIpLm5hbWUsICJ0cml2aWFsIikKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh0b29sLmNvbW1h bmRfYnlfbmFtZSgiYmFyIiksIE5vbmUpCiAKICAgICBkZWYgdGVzdF9jb21tYW5kX2hlbHAoc2Vs Zik6Ci0gICAgICAgIGNvbW1hbmRfd2l0aF9hcmdzID0gVHJpdmlhbENvbW1hbmQob3B0aW9ucz1b bWFrZV9vcHRpb24oIi0tbXlfb3B0aW9uIildKQotICAgICAgICBmb29fY29tbWFuZCA9IHsgIm5h bWUiIDogImZvb19jb21tYW5kIiwgIm9iamVjdCIgOiAgY29tbWFuZF93aXRoX2FyZ3MgfQotICAg ICAgICB0b29sID0gVHJpdmlhbFRvb2woW2Zvb19jb21tYW5kXSkKKyAgICAgICAgY29tbWFuZF93 aXRoX29wdGlvbnMgPSBUcml2aWFsQ29tbWFuZChvcHRpb25zPVttYWtlX29wdGlvbigiLS1teV9v cHRpb24iKV0pCisgICAgICAgIHRvb2wgPSBUcml2aWFsVG9vbChjb21tYW5kcz1bY29tbWFuZF93 aXRoX29wdGlvbnNdKQogCiAgICAgICAgIHNlbGYuX2NhcHR1cmVfc3RkZXJyKCkKLSAgICAgICAg ZXhpdF9jb2RlID0gdG9vbC5tYWluKFsidG9vbCIsICJoZWxwIiwgImZvb19jb21tYW5kIl0pCisg ICAgICAgIGV4aXRfY29kZSA9IHRvb2wubWFpbihbInRvb2wiLCAiaGVscCIsICJ0cml2aWFsIl0p CiAgICAgICAgIGhlbHBfdGV4dCA9IHNlbGYuX3JlbGVhc2Vfc3RkZXJyKCkKLSAgICAgICAgZXhw ZWN0ZWRfc3ViY29tbWFuZF9oZWxwID0gIiAgZm9vX2NvbW1hbmQgW29wdGlvbnNdICAgaGVscCB0 ZXh0XG5PcHRpb25zOlxuICAtLW15X29wdGlvbj1NWV9PUFRJT05cblxuIgorICAgICAgICBleHBl Y3RlZF9zdWJjb21tYW5kX2hlbHAgPSAiICB0cml2aWFsIFtvcHRpb25zXSAgIGhlbHAgdGV4dFxu T3B0aW9uczpcbiAgLS1teV9vcHRpb249TVlfT1BUSU9OXG5cbiIKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChleGl0X2NvZGUsIDApCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoaGVscF90ZXh0 LCBleHBlY3RlZF9zdWJjb21tYW5kX2hlbHApCiAKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy93b3JrcXVldWUucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv d29ya3F1ZXVlLnB5CmluZGV4IDQ0YmQzOGYuLjMyNjRiY2QgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVldWUucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0 cy9tb2R1bGVzL3dvcmtxdWV1ZS5weQpAQCAtMTA5LDYgKzEwOSw3IEBAIGNsYXNzIFdvcmtRdWV1 ZToKICAgICAgICAgICAgICAgICBzZWxmLl9zbGVlcCgiRXhjZXB0aW9uIHdoaWxlIHByZXBhcmlu ZyBxdWV1ZTogJXMuIiAlIGUpCiAgICAgICAgICAgICAgICAgY29udGludWUKIAorICAgICAgICAg ICAgIyBGSVhNRTogV29yayBsb2dzIHNob3VsZCBub3QgZGVwZW5kIG9uIGJ1Z19pZCBzcGVjaWZp Y2FseS4KICAgICAgICAgICAgIHNlbGYuX29wZW5fd29ya19sb2cocGF0Y2hbImJ1Z19pZCJdKQog ICAgICAgICAgICAgdHJ5OgogICAgICAgICAgICAgICAgIHNlbGYuX2RlbGVnYXRlLnByb2Nlc3Nf d29ya19pdGVtKHdvcmtfaXRlbSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9k dWxlcy93b3JrcXVldWVfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv d29ya3F1ZXVlX3VuaXR0ZXN0LnB5CmluZGV4IDM0MjhhY2MuLjFlOWM4YWQgMTAwNjQ0Ci0tLSBh L1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy93b3JrcXVldWVfdW5pdHRlc3QucHkKKysrIGIv V2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVzL3dvcmtxdWV1ZV91bml0dGVzdC5weQpAQCAtODUs NyArODUsOCBAQCBjbGFzcyBMb2dnaW5nRGVsZWdhdGUoV29ya1F1ZXVlRGVsZWdhdGUpOgogICAg IGRlZiBzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbShzZWxmLCB3b3JrX2l0ZW0pOgogICAg ICAgICBzZWxmLnJlY29yZCgic2hvdWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0ZW0iKQogICAgICAg ICBzZWxmLl90ZXN0LmFzc2VydEVxdWFscyh3b3JrX2l0ZW0sICJ3b3JrX2l0ZW0iKQotICAgICAg ICByZXR1cm4gKFRydWUsICJ3YWl0aW5nX21lc3NhZ2UiLCA0MikKKyAgICAgICAgZmFrZV9wYXRj aCA9IHsgJ2J1Z19pZCcgOiA0MiB9CisgICAgICAgIHJldHVybiAoVHJ1ZSwgIndhaXRpbmdfbWVz c2FnZSIsIGZha2VfcGF0Y2gpCiAKICAgICBkZWYgcHJvY2Vzc193b3JrX2l0ZW0oc2VsZiwgd29y a19pdGVtKToKICAgICAgICAgc2VsZi5yZWNvcmQoInByb2Nlc3Nfd29ya19pdGVtIikKQEAgLTEx MCwxMiArMTExLDEzIEBAIGNsYXNzIE5vdFNhZmVUb1Byb2NlZWREZWxlZ2F0ZShMb2dnaW5nRGVs ZWdhdGUpOgogICAgIGRlZiBzaG91bGRfcHJvY2VlZF93aXRoX3dvcmtfaXRlbShzZWxmLCB3b3Jr X2l0ZW0pOgogICAgICAgICBzZWxmLnJlY29yZCgic2hvdWxkX3Byb2NlZWRfd2l0aF93b3JrX2l0 ZW0iKQogICAgICAgICBzZWxmLl90ZXN0LmFzc2VydEVxdWFscyh3b3JrX2l0ZW0sICJ3b3JrX2l0 ZW0iKQotICAgICAgICByZXR1cm4gKEZhbHNlLCAid2FpdGluZ19tZXNzYWdlIiwgNDIpCisgICAg ICAgIGZha2VfcGF0Y2ggPSB7ICdidWdfaWQnIDogNDIgfQorICAgICAgICByZXR1cm4gKEZhbHNl LCAid2FpdGluZ19tZXNzYWdlIiwgZmFrZV9wYXRjaCkKIAogCiBjbGFzcyBGYXN0V29ya1F1ZXVl KFdvcmtRdWV1ZSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGRlbGVnYXRlKToKLSAgICAgICAg V29ya1F1ZXVlLl9faW5pdF9fKHNlbGYsIGRlbGVnYXRlKQorICAgICAgICBXb3JrUXVldWUuX19p bml0X18oc2VsZiwgImZhc3QtcXVldWUiLCBkZWxlZ2F0ZSkKIAogICAgICMgTm8gc2xlZXAgZm9y IHRoZSB3aWNrZWQuCiAgICAgc2Vjb25kc190b19zbGVlcCA9IDAKQEAgLTEyNyw3ICsxMjksNyBA QCBjbGFzcyBGYXN0V29ya1F1ZXVlKFdvcmtRdWV1ZSk6CiBjbGFzcyBXb3JrUXVldWVUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF90cml2aWFsKHNlbGYpOgogICAgICAgICBk ZWxlZ2F0ZSA9IExvZ2dpbmdEZWxlZ2F0ZShzZWxmKQotICAgICAgICB3b3JrX3F1ZXVlID0gV29y a1F1ZXVlKGRlbGVnYXRlKQorICAgICAgICB3b3JrX3F1ZXVlID0gV29ya1F1ZXVlKCJ0cml2aWFs LXF1ZXVlIiwgZGVsZWdhdGUpCiAgICAgICAgIHdvcmtfcXVldWUucnVuKCkKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoZGVsZWdhdGUuX2NhbGxiYWNrcywgTG9nZ2luZ0RlbGVnYXRlLmV4cGVj dGVkX2NhbGxiYWNrcykKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG9zLnBhdGguZXhpc3RzKGRl bGVnYXRlLnF1ZXVlX2xvZ19wYXRoKCkpKQpAQCAtMTM1LDcgKzEzNyw3IEBAIGNsYXNzIFdvcmtR dWV1ZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRlc3RfdW5leHBlY3RlZF9l cnJvcihzZWxmKToKICAgICAgICAgZGVsZWdhdGUgPSBUaHJvd0Vycm9yRGVsZWdhdGUoc2VsZiwg MykKLSAgICAgICAgd29ya19xdWV1ZSA9IFdvcmtRdWV1ZShkZWxlZ2F0ZSkKKyAgICAgICAgd29y a19xdWV1ZSA9IFdvcmtRdWV1ZSgiZXJyb3ItcXVldWUiLCBkZWxlZ2F0ZSkKICAgICAgICAgd29y a19xdWV1ZS5ydW4oKQogICAgICAgICBleHBlY3RlZF9jYWxsYmFja3MgPSBMb2dnaW5nRGVsZWdh dGUuZXhwZWN0ZWRfY2FsbGJhY2tzWzpdCiAgICAgICAgIHdvcmtfaXRlbV9pbmRleCA9IGV4cGVj dGVkX2NhbGxiYWNrcy5pbmRleCgncHJvY2Vzc193b3JrX2l0ZW0nKQpAQCAtMTQ2LDcgKzE0OCw3 IEBAIGNsYXNzIFdvcmtRdWV1ZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRl c3RfaGFuZGxlZF9lcnJvcihzZWxmKToKICAgICAgICAgZGVsZWdhdGUgPSBUaHJvd0Vycm9yRGVs ZWdhdGUoc2VsZiwgV29ya1F1ZXVlLmhhbmRsZWRfZXJyb3JfY29kZSkKLSAgICAgICAgd29ya19x dWV1ZSA9IFdvcmtRdWV1ZShkZWxlZ2F0ZSkKKyAgICAgICAgd29ya19xdWV1ZSA9IFdvcmtRdWV1 ZSgiaGFuZGxlZC1lcnJvci1xdWV1ZSIsIGRlbGVnYXRlKQogICAgICAgICB3b3JrX3F1ZXVlLnJ1 bigpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGRlbGVnYXRlLl9jYWxsYmFja3MsIExvZ2dp bmdEZWxlZ2F0ZS5leHBlY3RlZF9jYWxsYmFja3MpCiAK