92785 2012-07-31 12:56:18 -0700 nrwt: clean up names in sharding code 2012-07-31 13:51:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED NRWT P2 Normal --- 92784 89267 1 dpranke dpranke abarth eric ojan rniwa tony oldest_to_newest 683404 0 dpranke 2012-07-31 12:56:18 -0700 nrwt: clean up names in sharding code 683406 1 155610 dpranke 2012-07-31 13:00:16 -0700 Created attachment 155610 Patch 683446 2 dpranke 2012-07-31 13:51:09 -0700 Committed r124247: <http://trac.webkit.org/changeset/124247> 155610 2012-07-31 13:00:16 -0700 2012-07-31 13:32:47 -0700 Patch bug-92785-20120731125959.patch text/plain 12185 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MjQwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODBhY2JkMWU0MTY4ZjJiNDA3ZWU0YmNiNGMwM2VkMTgz NzZkZDQ5ZS4uZmIyYTBlOTU0MDYxNzlkZDAzYzVlMGVlYTU0YzU5ZDJiYjNiYmIzNiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM2 IEBACiAyMDEyLTA3LTMxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIG5hbWVzIGluIHNoYXJkaW5nIGNvZGUKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNzg1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW9yZSByZWZhY3RvcmluZyAuLi4g dGhpcyBtYWtlcyB0aGUgbWV0aG9kcyB1c2UgVGVzdElucHV0cworICAgICAgICBjb25zaXN0ZW50 bHkgKGFuZCB1cGRhdGVzIHRoZSBuYW1lcyBhY2NvcmRpbmdseSkgYW5kIGltcHJvdmVzCisgICAg ICAgIGVuY2Fwc3VsYXRpb24gYSBiaXQuIFRoZSBzaGFyZGluZyBjb2RlIGlzIG5vdyBwcmV0dHkK KyAgICAgICAgc2VsZi1jb250YWluZWQuCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgYWRkcyBubyBu ZXcgZnVuY3Rpb25hbGl0eSBhbmQgaXMgY292ZXJlZCBieSB0aGUKKyAgICAgICAgZXhpc3Rpbmcg KHVwZGF0ZWQpIHRlc3RzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKFRlc3RTaGFyZC52aXNpYmxlLl9f aW5pdF9fKToKKyAgICAgICAgKFRlc3RTaGFyZC52aXNpYmxlLl9fcmVwcl9fKToKKyAgICAgICAg KE1hbmFnZXIuX2Rpcl9mb3JfdGVzdF9pbnB1dCk6CisgICAgICAgIChNYW5hZ2VyLl9zaGFyZF90 ZXN0cyk6CisgICAgICAgIChNYW5hZ2VyLl9zaGFyZF9pbl90d28pOgorICAgICAgICAoTWFuYWdl ci5fc2hhcmRfZXZlcnlfZmlsZSk6CisgICAgICAgIChNYW5hZ2VyLl9zaGFyZF9ieV9kaXJlY3Rv cnkpOgorICAgICAgICAoTWFuYWdlci5fcnVuX3Rlc3RzKToKKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5OgorICAg ICAgICAoTWFuYWdlcldyYXBwZXIuX3Rlc3RfaW5wdXRfZm9yX2ZpbGUpOgorICAgICAgICAoU2hh cmRpbmdUZXN0cy5nZXRfc2hhcmRzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9tb2RlbHMvdGVzdF9pbnB1dC5weToKKyAgICAgICAgKFRlc3RJbnB1dC5fX2luaXRf Xyk6CisgICAgICAgIChUZXN0SW5wdXQuX19yZXByX18pOgorCisyMDEyLTA3LTMxICBEaXJrIFBy YW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIG5yd3Q6IGNsZWFuIHVwIFRl c3RJbnB1dHMgaW4gcHJlcGFyYXRpb24gZm9yIGNsZWFuaW5nIHVwIHNoYXJkaW5nCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Mjc4NAogCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5h Z2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlci5weQppbmRleCBkYjA2MmRhYmM1YmY3ZjRjNGU5NWMzN2E2MTIzNmZjYzBlYjRjZjY4 Li4zYjMyMmU3ODU5YmU4NTNkNGRhMTk5ZjY1OWYwMWFlNzg1ZGNiNzdhIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXIucHkKQEAgLTI3Niw5ICsyNzYsMTAgQEAgY2xhc3MgVGVzdFNoYXJkKG9iamVjdCk6CiAg ICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIHRlc3RfaW5wdXRzKToKICAgICAgICAgc2VsZi5u YW1lID0gbmFtZQogICAgICAgICBzZWxmLnRlc3RfaW5wdXRzID0gdGVzdF9pbnB1dHMKKyAgICAg ICAgc2VsZi5yZXF1aXJlc19sb2NrID0gdGVzdF9pbnB1dHNbMF0ucmVxdWlyZXNfbG9jawogCiAg ICAgZGVmIF9fcmVwcl9fKHNlbGYpOgotICAgICAgICByZXR1cm4gIlRlc3RTaGFyZChuYW1lPScl cycsIHRlc3RfaW5wdXRzPSVzJyIgJSAoc2VsZi5uYW1lLCBzZWxmLnRlc3RfaW5wdXRzKQorICAg ICAgICByZXR1cm4gIlRlc3RTaGFyZChuYW1lPSclcycsIHRlc3RfaW5wdXRzPSVzJywgcmVxdWly ZXNfbG9jaz0lcykiICUgKHNlbGYubmFtZSwgc2VsZi50ZXN0X2lucHV0cywgc2VsZi5yZXF1aXJl c19sb2NrKQogCiAgICAgZGVmIF9fZXFfXyhzZWxmLCBvdGhlcik6CiAgICAgICAgIHJldHVybiBz ZWxmLm5hbWUgPT0gb3RoZXIubmFtZSBhbmQgc2VsZi50ZXN0X2lucHV0cyA9PSBvdGhlci50ZXN0 X2lucHV0cwpAQCAtMzcxLDEwICszNzIsMTAgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAg ICAgICBpdGVyYXRpb25zID0gc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCAqIHNlbGYuX29wdGlv bnMuaXRlcmF0aW9ucwogICAgICAgICByZXR1cm4gUmVzdWx0U3VtbWFyeShzZWxmLl9leHBlY3Rh dGlvbnMsIHNldChzZWxmLl90ZXN0X25hbWVzKSwgaXRlcmF0aW9ucywgdGVzdHNfdG9fc2tpcCkK IAotICAgIGRlZiBfZ2V0X2Rpcl9mb3JfdGVzdF9maWxlKHNlbGYsIHRlc3RfZmlsZSk6CisgICAg ZGVmIF9kaXJfZm9yX3Rlc3RfaW5wdXQoc2VsZiwgdGVzdF9pbnB1dCk6CiAgICAgICAgICIiIlJl dHVybnMgdGhlIGhpZ2hlc3QtbGV2ZWwgZGlyZWN0b3J5IGJ5IHdoaWNoIHRvIHNoYXJkIHRoZSBn aXZlbgogICAgICAgICB0ZXN0IGZpbGUuIiIiCi0gICAgICAgIGRpcmVjdG9yeSwgdGVzdF9maWxl ID0gc2VsZi5fcG9ydC5zcGxpdF90ZXN0KHRlc3RfZmlsZSkKKyAgICAgICAgZGlyZWN0b3J5LCB0 ZXN0X2ZpbGUgPSBzZWxmLl9wb3J0LnNwbGl0X3Rlc3QodGVzdF9pbnB1dC50ZXN0X25hbWUpCiAK ICAgICAgICAgIyBUaGUgaHR0cCB0ZXN0cyBhcmUgdmVyeSBzdGFibGUgb24gbWFjL2xpbnV4Lgog ICAgICAgICAjIFRPRE8ob2phbik6IE1ha2UgdGhlIGh0dHAgc2VydmVyIG9uIFdpbmRvd3MgYmUg YXBhY2hlIHNvIHdlIGNhbgpAQCAtNDA0LDcgKzQwNSw3IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0 KToKICAgICAgICAgICAgIHRlc3RfaW5wdXQucmVmZXJlbmNlX2ZpbGVzID0gc2VsZi5fcG9ydC5y ZWZlcmVuY2VfZmlsZXModGVzdF9pbnB1dC50ZXN0X25hbWUpCiAgICAgICAgIHJldHVybiBib29s KHRlc3RfaW5wdXQucmVmZXJlbmNlX2ZpbGVzKQogCi0gICAgZGVmIF9zaGFyZF90ZXN0cyhzZWxm LCB0ZXN0X2ZpbGVzLCBudW1fd29ya2VycywgZnVsbHlfcGFyYWxsZWwsIHNoYXJkX3JlZl90ZXN0 cyk6CisgICAgZGVmIF9zaGFyZF90ZXN0cyhzZWxmLCB0ZXN0X2lucHV0cywgbnVtX3dvcmtlcnMs IGZ1bGx5X3BhcmFsbGVsLCBzaGFyZF9yZWZfdGVzdHMpOgogICAgICAgICAiIiJHcm91cHMgdGVz dHMgaW50byBiYXRjaGVzLgogICAgICAgICBUaGlzIGhlbHBzIGVuc3VyZSB0aGF0IHRlc3RzIHRo YXQgZGVwZW5kIG9uIGVhY2ggb3RoZXIgKGFrYSBiYWQgdGVzdHMhKQogICAgICAgICBjb250aW51 ZSB0byBydW4gdG9nZXRoZXIgYXMgbW9zdCBjcm9zcy10ZXN0cyBkZXBlbmRlbmNpZXMgdGVuZCB0 bwpAQCAtNDE4LDEyICs0MTksMTIgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAj IG93biBjbGFzcyBvciBtb2R1bGUuIENvbnNpZGVyIGdyb3VwaW5nIGl0IHdpdGggdGhlIGNodW5r aW5nIGxvZ2ljCiAgICAgICAgICMgaW4gcHJlcGFyZV9saXN0cyBhcyB3ZWxsLgogICAgICAgICBp ZiBudW1fd29ya2VycyA9PSAxOgotICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3NoYXJkX2luX3R3 byh0ZXN0X2ZpbGVzLCBzaGFyZF9yZWZfdGVzdHMpCisgICAgICAgICAgICByZXR1cm4gc2VsZi5f c2hhcmRfaW5fdHdvKHRlc3RfaW5wdXRzLCBzaGFyZF9yZWZfdGVzdHMpCiAgICAgICAgIGVsaWYg ZnVsbHlfcGFyYWxsZWw6Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5fc2hhcmRfZXZlcnlfZmls ZSh0ZXN0X2ZpbGVzKQotICAgICAgICByZXR1cm4gc2VsZi5fc2hhcmRfYnlfZGlyZWN0b3J5KHRl c3RfZmlsZXMsIG51bV93b3JrZXJzLCBzaGFyZF9yZWZfdGVzdHMpCisgICAgICAgICAgICByZXR1 cm4gc2VsZi5fc2hhcmRfZXZlcnlfZmlsZSh0ZXN0X2lucHV0cykKKyAgICAgICAgcmV0dXJuIHNl bGYuX3NoYXJkX2J5X2RpcmVjdG9yeSh0ZXN0X2lucHV0cywgbnVtX3dvcmtlcnMsIHNoYXJkX3Jl Zl90ZXN0cykKIAotICAgIGRlZiBfc2hhcmRfaW5fdHdvKHNlbGYsIHRlc3RfZmlsZXMsIHNoYXJk X3JlZl90ZXN0cyk6CisgICAgZGVmIF9zaGFyZF9pbl90d28oc2VsZiwgdGVzdF9pbnB1dHMsIHNo YXJkX3JlZl90ZXN0cyk6CiAgICAgICAgICIiIlJldHVybnMgdHdvIGxpc3RzIG9mIHNoYXJkcywg b25lIHdpdGggYWxsIHRoZSB0ZXN0cyByZXF1aXJpbmcgYSBsb2NrIGFuZCBvbmUgd2l0aCB0aGUg cmVzdC4KIAogICAgICAgICBUaGlzIGlzIHVzZWQgd2hlbiB0aGVyZSdzIG9ubHkgb25lIHdvcmtl ciwgdG8gbWluaW1pemUgdGhlIHBlci1zaGFyZCBvdmVyaGVhZC4iIiIKQEAgLTQzMSw5ICs0MzIs OCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIGxvY2tlZF9yZWZfdGVzdF9pbnB1 dHMgPSBbXQogICAgICAgICB1bmxvY2tlZF9pbnB1dHMgPSBbXQogICAgICAgICB1bmxvY2tlZF9y ZWZfdGVzdF9pbnB1dHMgPSBbXQotICAgICAgICBmb3IgdGVzdF9maWxlIGluIHRlc3RfZmlsZXM6 Ci0gICAgICAgICAgICB0ZXN0X2lucHV0ID0gc2VsZi5fdGVzdF9pbnB1dF9mb3JfZmlsZSh0ZXN0 X2ZpbGUpCi0gICAgICAgICAgICBpZiBzZWxmLl90ZXN0X3JlcXVpcmVzX2xvY2sodGVzdF9maWxl KToKKyAgICAgICAgZm9yIHRlc3RfaW5wdXQgaW4gdGVzdF9pbnB1dHM6CisgICAgICAgICAgICBp ZiB0ZXN0X2lucHV0LnJlcXVpcmVzX2xvY2s6CiAgICAgICAgICAgICAgICAgaWYgc2hhcmRfcmVm X3Rlc3RzIGFuZCB0ZXN0X2lucHV0LnJlZmVyZW5jZV9maWxlczoKICAgICAgICAgICAgICAgICAg ICAgbG9ja2VkX3JlZl90ZXN0X2lucHV0cy5hcHBlbmQodGVzdF9pbnB1dCkKICAgICAgICAgICAg ICAgICBlbHNlOgpAQCAtNDU1LDI2ICs0NTUsMjQgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgog CiAgICAgICAgIHJldHVybiBsb2NrZWRfc2hhcmRzLCB1bmxvY2tlZF9zaGFyZHMKIAotICAgIGRl ZiBfc2hhcmRfZXZlcnlfZmlsZShzZWxmLCB0ZXN0X2ZpbGVzKToKKyAgICBkZWYgX3NoYXJkX2V2 ZXJ5X2ZpbGUoc2VsZiwgdGVzdF9pbnB1dHMpOgogICAgICAgICAiIiJSZXR1cm5zIHR3byBsaXN0 cyBvZiBzaGFyZHMsIGVhY2ggc2hhcmQgY29udGFpbmluZyBhIHNpbmdsZSB0ZXN0IGZpbGUuCiAK ICAgICAgICAgVGhpcyBtb2RlIGdldHMgbWF4aW1hbCBwYXJhbGxlbGlzbSBhdCB0aGUgY29zdCBv ZiBtdWNoIGhpZ2hlciBmbGFraW5lc3MuIiIiCiAgICAgICAgIGxvY2tlZF9zaGFyZHMgPSBbXQog ICAgICAgICB1bmxvY2tlZF9zaGFyZHMgPSBbXQotICAgICAgICBmb3IgdGVzdF9maWxlIGluIHRl c3RfZmlsZXM6Ci0gICAgICAgICAgICB0ZXN0X2lucHV0ID0gc2VsZi5fdGVzdF9pbnB1dF9mb3Jf ZmlsZSh0ZXN0X2ZpbGUpCi0KKyAgICAgICAgZm9yIHRlc3RfaW5wdXQgaW4gdGVzdF9pbnB1dHM6 CiAgICAgICAgICAgICAjIE5vdGUgdGhhdCB3ZSB1c2UgYSAnLicgZm9yIHRoZSBzaGFyZCBuYW1l OyB0aGUgbmFtZSBkb2Vzbid0IHJlYWxseQogICAgICAgICAgICAgIyBtYXR0ZXIsIGFuZCB0aGUg b25seSBvdGhlciBtZWFuaW5nZnVsIHZhbHVlIHdvdWxkIGJlIHRoZSBmaWxlbmFtZSwKICAgICAg ICAgICAgICMgd2hpY2ggd291bGQgYmUgcmVhbGx5IHJlZHVuZGFudC4KLSAgICAgICAgICAgIGlm IHNlbGYuX3Rlc3RfcmVxdWlyZXNfbG9jayh0ZXN0X2ZpbGUpOgorICAgICAgICAgICAgaWYgdGVz dF9pbnB1dC5yZXF1aXJlc19sb2NrOgogICAgICAgICAgICAgICAgIGxvY2tlZF9zaGFyZHMuYXBw ZW5kKFRlc3RTaGFyZCgnLicsIFt0ZXN0X2lucHV0XSkpCiAgICAgICAgICAgICBlbHNlOgogICAg ICAgICAgICAgICAgIHVubG9ja2VkX3NoYXJkcy5hcHBlbmQoVGVzdFNoYXJkKCcuJywgW3Rlc3Rf aW5wdXRdKSkKIAogICAgICAgICByZXR1cm4gbG9ja2VkX3NoYXJkcywgdW5sb2NrZWRfc2hhcmRz CiAKLSAgICBkZWYgX3NoYXJkX2J5X2RpcmVjdG9yeShzZWxmLCB0ZXN0X2ZpbGVzLCBudW1fd29y a2Vycywgc2hhcmRfcmVmX3Rlc3RzKToKKyAgICBkZWYgX3NoYXJkX2J5X2RpcmVjdG9yeShzZWxm LCB0ZXN0X2lucHV0cywgbnVtX3dvcmtlcnMsIHNoYXJkX3JlZl90ZXN0cyk6CiAgICAgICAgICIi IlJldHVybnMgdHdvIGxpc3RzIG9mIHNoYXJkcywgZWFjaCBzaGFyZCBjb250YWluaW5nIGFsbCB0 aGUgZmlsZXMgaW4gYSBkaXJlY3RvcnkuCiAKICAgICAgICAgVGhpcyBpcyB0aGUgZGVmYXVsdCBt b2RlLCBhbmQgZ2V0cyBhcyBtdWNoIHBhcmFsbGVsaXNtIGFzIHdlIGNhbiB3aGlsZQpAQCAtNDg1 LDkgKzQ4Myw4IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgcmVmX3Rlc3RzX2J5 X2RpciA9IHt9CiAgICAgICAgICMgRklYTUU6IEdpdmVuIHRoYXQgdGhlIHRlc3RzIGFyZSBhbHJl YWR5IHNvcnRlZCBieSBkaXJlY3RvcnksCiAgICAgICAgICMgd2UgY2FuIHByb2JhYmx5IHJld3Jp dGUgdGhpcyB0byBiZSBjbGVhcmVyIGFuZCBmYXN0ZXIuCi0gICAgICAgIGZvciB0ZXN0X2ZpbGUg aW4gdGVzdF9maWxlczoKLSAgICAgICAgICAgIGRpcmVjdG9yeSA9IHNlbGYuX2dldF9kaXJfZm9y X3Rlc3RfZmlsZSh0ZXN0X2ZpbGUpCi0gICAgICAgICAgICB0ZXN0X2lucHV0ID0gc2VsZi5fdGVz dF9pbnB1dF9mb3JfZmlsZSh0ZXN0X2ZpbGUpCisgICAgICAgIGZvciB0ZXN0X2lucHV0IGluIHRl c3RfaW5wdXRzOgorICAgICAgICAgICAgZGlyZWN0b3J5ID0gc2VsZi5fZGlyX2Zvcl90ZXN0X2lu cHV0KHRlc3RfaW5wdXQpCiAgICAgICAgICAgICBpZiBzaGFyZF9yZWZfdGVzdHMgYW5kIHRlc3Rf aW5wdXQucmVmZXJlbmNlX2ZpbGVzOgogICAgICAgICAgICAgICAgIHJlZl90ZXN0c19ieV9kaXIu c2V0ZGVmYXVsdChkaXJlY3RvcnksIFtdKQogICAgICAgICAgICAgICAgIHJlZl90ZXN0c19ieV9k aXJbZGlyZWN0b3J5XS5hcHBlbmQodGVzdF9pbnB1dCkKQEAgLTQ5Nyw3ICs0OTQsNyBAQCBjbGFz cyBNYW5hZ2VyKG9iamVjdCk6CiAKICAgICAgICAgZm9yIGRpcmVjdG9yeSwgdGVzdF9pbnB1dHMg aW4gdGVzdHNfYnlfZGlyLml0ZXJpdGVtcygpOgogICAgICAgICAgICAgc2hhcmQgPSBUZXN0U2hh cmQoZGlyZWN0b3J5LCB0ZXN0X2lucHV0cykKLSAgICAgICAgICAgIGlmIHNlbGYuX3Rlc3RfcmVx dWlyZXNfbG9jayhkaXJlY3RvcnkpOgorICAgICAgICAgICAgaWYgc2hhcmQucmVxdWlyZXNfbG9j azoKICAgICAgICAgICAgICAgICBsb2NrZWRfc2hhcmRzLmFwcGVuZChzaGFyZCkKICAgICAgICAg ICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgdW5sb2NrZWRfc2hhcmRzLmFwcGVuZChzaGFyZCkK QEAgLTUwNSw3ICs1MDIsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIGZvciBk aXJlY3RvcnksIHRlc3RfaW5wdXRzIGluIHJlZl90ZXN0c19ieV9kaXIuaXRlcml0ZW1zKCk6CiAg ICAgICAgICAgICAjICd+JyB0byBwbGFjZSB0aGUgcmVmIHRlc3RzIGFmdGVyIG90aGVyIHRlc3Rz IGFmdGVyIHNvcnRlZC4KICAgICAgICAgICAgIHNoYXJkID0gVGVzdFNoYXJkKCd+cmVmOicgKyBk aXJlY3RvcnksIHRlc3RfaW5wdXRzKQotICAgICAgICAgICAgaWYgc2VsZi5fdGVzdF9yZXF1aXJl c19sb2NrKGRpcmVjdG9yeSk6CisgICAgICAgICAgICBpZiBzaGFyZC5yZXF1aXJlc19sb2NrOgog ICAgICAgICAgICAgICAgIGxvY2tlZF9zaGFyZHMuYXBwZW5kKHNoYXJkKQogICAgICAgICAgICAg ZWxzZToKICAgICAgICAgICAgICAgICB1bmxvY2tlZF9zaGFyZHMuYXBwZW5kKHNoYXJkKQpAQCAt NTkxLDcgKzU4OCw4IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgaW50ZXJydXB0 ZWQgPSBGYWxzZQogCiAgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCdTaGFyZGlu ZyB0ZXN0cyAuLi4nKQotICAgICAgICBsb2NrZWRfc2hhcmRzLCB1bmxvY2tlZF9zaGFyZHMgPSBz ZWxmLl9zaGFyZF90ZXN0cyhmaWxlX2xpc3QsIGludChzZWxmLl9vcHRpb25zLmNoaWxkX3Byb2Nl c3NlcyksIHNlbGYuX29wdGlvbnMuZnVsbHlfcGFyYWxsZWwsIHNlbGYuX29wdGlvbnMuc2hhcmRf cmVmX3Rlc3RzKQorICAgICAgICB0ZXN0X2lucHV0cyA9IFtzZWxmLl90ZXN0X2lucHV0X2Zvcl9m aWxlKGZpbGUpIGZvciBmaWxlIGluIGZpbGVfbGlzdF0KKyAgICAgICAgbG9ja2VkX3NoYXJkcywg dW5sb2NrZWRfc2hhcmRzID0gc2VsZi5fc2hhcmRfdGVzdHModGVzdF9pbnB1dHMsIGludChzZWxm Ll9vcHRpb25zLmNoaWxkX3Byb2Nlc3NlcyksIHNlbGYuX29wdGlvbnMuZnVsbHlfcGFyYWxsZWws IHNlbGYuX29wdGlvbnMuc2hhcmRfcmVmX3Rlc3RzKQogCiAgICAgICAgICMgRklYTUU6IFdlIGRv bid0IGhhdmUgYSBnb29kIHdheSB0byBjb29yZGluYXRlIHRoZSB3b3JrZXJzIHNvIHRoYXQKICAg ICAgICAgIyB0aGV5IGRvbid0IHRyeSB0byBydW4gdGhlIHNoYXJkcyB0aGF0IG5lZWQgYSBsb2Nr IGlmIHdlIGRvbid0IGFjdHVhbGx5CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5w eQppbmRleCA2M2QwM2I5MjAwYjEzYWM4NjZhZjA5NzY3NjBiODUxMWU5Njc0YWVmLi42YjIxNGEy OGNhNzY4ZjU4OWVlMGJlMWMwZDY0NjlhMzJjMDc1NTZiIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXJfdW5pdHRlc3QucHkKQEAgLTY0LDcgKzY0LDggQEAgY2xhc3MgTWFuYWdlcldyYXBwZXIo TWFuYWdlcik6CiAgICAgICAgIHNlbGYuX3JlZl90ZXN0cyA9IHJlZl90ZXN0cwogCiAgICAgZGVm IF90ZXN0X2lucHV0X2Zvcl9maWxlKHNlbGYsIHRlc3RfZmlsZSk6Ci0gICAgICAgIHJldHVybiBU ZXN0SW5wdXQodGVzdF9maWxlLCByZWZlcmVuY2VfZmlsZXM9KFsnZm9vJ10gaWYgdGVzdF9maWxl IGluIHNlbGYuX3JlZl90ZXN0cyBlbHNlIE5vbmUpKQorICAgICAgICByZXR1cm4gVGVzdElucHV0 KHRlc3RfZmlsZSwgcmVmZXJlbmNlX2ZpbGVzPShbJ2ZvbyddIGlmIHRlc3RfZmlsZSBpbiBzZWxm Ll9yZWZfdGVzdHMgZWxzZSBOb25lKSwKKyAgICAgICAgICAgIHJlcXVpcmVzX2xvY2s9KHRlc3Rf ZmlsZS5zdGFydHN3aXRoKCdodHRwJykgb3IgdGVzdF9maWxlLnN0YXJ0c3dpdGgoJ3BlcmYnKSkp CiAKIAogY2xhc3MgU2hhcmRpbmdUZXN0cyh1bml0dGVzdC5UZXN0Q2FzZSk6CkBAIC05NSw3ICs5 Niw3IEBAIGNsYXNzIFNoYXJkaW5nVGVzdHModW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBw b3J0Ll9maWxlc3lzdGVtID0gTW9ja0ZpbGVTeXN0ZW0oKQogICAgICAgICBvcHRpb25zID0gTW9j a09wdGlvbnMobWF4X2xvY2tlZF9zaGFyZHM9bWF4X2xvY2tlZF9zaGFyZHMpCiAgICAgICAgIHNl bGYubWFuYWdlciA9IE1hbmFnZXJXcmFwcGVyKHNlbGYucmVmX3Rlc3RzLCBwb3J0PXBvcnQsIG9w dGlvbnM9b3B0aW9ucywgcHJpbnRlcj1Nb2NrKCkpCi0gICAgICAgIHJldHVybiBzZWxmLm1hbmFn ZXIuX3NoYXJkX3Rlc3RzKHRlc3RfbGlzdCwgbnVtX3dvcmtlcnMsIGZ1bGx5X3BhcmFsbGVsLCBz aGFyZF9yZWZfdGVzdHMpCisgICAgICAgIHJldHVybiBzZWxmLm1hbmFnZXIuX3NoYXJkX3Rlc3Rz KFtzZWxmLm1hbmFnZXIuX3Rlc3RfaW5wdXRfZm9yX2ZpbGUodGVzdCkgZm9yIHRlc3QgaW4gdGVz dF9saXN0XSwgbnVtX3dvcmtlcnMsIGZ1bGx5X3BhcmFsbGVsLCBzaGFyZF9yZWZfdGVzdHMpCiAK ICAgICBkZWYgYXNzZXJ0X3NoYXJkcyhzZWxmLCBhY3R1YWxfc2hhcmRzLCBleHBlY3RlZF9zaGFy ZF9uYW1lcyk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKGxlbihhY3R1YWxfc2hhcmRzKSwg bGVuKGV4cGVjdGVkX3NoYXJkX25hbWVzKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2lucHV0LnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfaW5wdXQucHkKaW5kZXggOGI2MmJiMmYz OGZiMzQ5OTc2NzhhNzBkM2JhNGQxZTlkZDZjZGViNy4uNTZmMmQ1MmJkZmRkNGIxYWE1NWQwNDMz YTM2YmIxOWM5OTFiZTgyZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbW9kZWxzL3Rlc3RfaW5wdXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfaW5wdXQucHkKQEAgLTMyLDE1ICszMiwxNSBAQAog Y2xhc3MgVGVzdElucHV0KG9iamVjdCk6CiAgICAgIiIiR3JvdXBzIGluZm9ybWF0aW9uIGFib3V0 IGEgdGVzdCBmb3IgZWFzeSBwYXNzaW5nIG9mIGRhdGEuIiIiCiAKLSAgICBkZWYgX19pbml0X18o c2VsZiwgdGVzdF9uYW1lLCB0aW1lb3V0PU5vbmUsIHRlc3RfcmVxdWlyZXNfbG9jaz1Ob25lLCBy ZWZlcmVuY2VfZmlsZXM9Tm9uZSwgc2hvdWxkX3J1bl9waXhlbF90ZXN0cz1Ob25lKToKKyAgICBk ZWYgX19pbml0X18oc2VsZiwgdGVzdF9uYW1lLCB0aW1lb3V0PU5vbmUsIHJlcXVpcmVzX2xvY2s9 Tm9uZSwgcmVmZXJlbmNlX2ZpbGVzPU5vbmUsIHNob3VsZF9ydW5fcGl4ZWxfdGVzdHM9Tm9uZSk6 CiAgICAgICAgICMgVGVzdElucHV0IG9iamVjdHMgYXJlIG5vcm1hbGx5IGNvbnN0cnVjdGVkIGJ5 IHRoZSBtYW5hZ2VyIGFuZCBwYXNzZWQKICAgICAgICAgIyB0byB0aGUgd29ya2VycywgYnV0IHRo ZXNlIHNvbWUgZmllbGRzIGFyZSBzZXQgbGF6aWx5IGluIHRoZSB3b3JrZXJzIHdoZXJlIHBvc3Np YmxlCiAgICAgICAgICMgYmVjYXVzZSB0aGV5IHJlcXVpcmUgdXMgdG8gbG9vayBhdCB0aGUgZmls ZXN5c3RlbSBhbmQgd2Ugd2FudCB0byBiZSBhYmxlIHRvIGRvIHRoYXQgaW4gcGFyYWxsZWwuCiAg ICAgICAgIHNlbGYudGVzdF9uYW1lID0gdGVzdF9uYW1lCiAgICAgICAgIHNlbGYudGltZW91dCA9 IHRpbWVvdXQgICMgaW4gbXNlY3M7IHNob3VsZCByZW5hbWUgdGhpcyBmb3IgY29uc2lzdGVuY3kK LSAgICAgICAgc2VsZi50ZXN0X3JlcXVpcmVzX2xvY2sgPSB0ZXN0X3JlcXVpcmVzX2xvY2sKLSAg ICAgICAgc2VsZi5zaG91bGRfcnVuX3BpeGVsX3Rlc3RzID0gc2hvdWxkX3J1bl9waXhlbF90ZXN0 cworICAgICAgICBzZWxmLnJlcXVpcmVzX2xvY2sgPSByZXF1aXJlc19sb2NrCiAgICAgICAgIHNl bGYucmVmZXJlbmNlX2ZpbGVzID0gcmVmZXJlbmNlX2ZpbGVzCisgICAgICAgIHNlbGYuc2hvdWxk X3J1bl9waXhlbF90ZXN0cyA9IHNob3VsZF9ydW5fcGl4ZWxfdGVzdHMKIAogICAgIGRlZiBfX3Jl cHJfXyhzZWxmKToKLSAgICAgICAgcmV0dXJuICJUZXN0SW5wdXQoJyVzJywgJXMsICVzLCAlcywg JXMpIiAlIChzZWxmLnRlc3RfbmFtZSwgc2VsZi50aW1lb3V0LCBzZWxmLnRlc3RfcmVxdWlyZXNf bG9jaywgc2VsZi5zaG91bGRfcnVuX3BpeGVsX3Rlc3RzLCBzZWxmLnJlZmVyZW5jZV9maWxlcykK KyAgICAgICAgcmV0dXJuICJUZXN0SW5wdXQoJyVzJywgdGltZW91dD0lcywgcmVxdWlyZXNfbG9j az0lcywgcmVmZXJlbmNlX2ZpbGVzPSVzLCBzaG91bGRfcnVuX3BpeGVsX3Rlc3RzPSVzKSIgJSAo c2VsZi50ZXN0X25hbWUsIHNlbGYudGltZW91dCwgc2VsZi5yZXF1aXJlc19sb2NrLCBzZWxmLnJl ZmVyZW5jZV9maWxlcywgc2VsZi5zaG91bGRfcnVuX3BpeGVsX3Rlc3RzKQo=