111148 2013-02-28 23:49:11 -0800 Don’t use legacy test names when returning results from PerfTest.run 2013-03-01 14:56:50 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 110954 111145 77037 1 rniwa rniwa abarth dpranke eric oldest_to_newest 844864 0 rniwa 2013-02-28 23:49:11 -0800 Now that we’ve moved away from webkit-perf.webkit.org, there is no reason for us to be using the legacy test name. 845524 1 191041 rniwa 2013-03-01 14:49:10 -0800 Created attachment 191041 Cleanup 845528 2 191043 rniwa 2013-03-01 14:51:45 -0800 Created attachment 191043 Reverted log_statistics change 845534 3 rniwa 2013-03-01 14:56:50 -0800 Committed r144510: <http://trac.webkit.org/changeset/144510> 191041 2013-03-01 14:49:10 -0800 2013-03-01 14:51:44 -0800 Cleanup bug-111148-20130301144522.patch text/plain 16858 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0NDUwNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM3IEBACisyMDEzLTAzLTAxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIERvbuKAmXQgdXNlIGxlZ2FjeSB0ZXN0IG5hbWVzIHdoZW4gcmV0dXJuaW5nIHJl c3VsdHMgZnJvbSBQZXJmVGVzdC5ydW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMTE0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJm dGVzdC5weToKKyAgICAgICAgKFBlcmZUZXN0TWV0cmljLm5hbWUpOiBSZW5hbWVkIGZyb20gbWV0 cmljLgorICAgICAgICAoUGVyZlRlc3QudGVzdF9uYW1lX3dpdGhvdXRfZmlsZV9leHRlbnNpb24p OiBFeHRyYWN0ZWQgZnJvbSBsZWdhY3lfY2hyb21pdW1fYm90X2NvbXBhdGlibGVfdGVzdF9uYW1l LgorICAgICAgICAoUGVyZlRlc3QucnVuKTogVXNlIG1ldHJpYyBuYW1lIGluc3RlYWQgb2YgdGhl IGxlZ2FjeSBuYW1lIHRvIHN0b3JlIGl0ZXJhdGlvbiB2YWx1ZXMuCisKKyAgICAgICAgKFBlcmZU ZXN0LmxvZ19zdGF0aXN0aWNzLmhpZ2hlc3RfZGVjaW1hbF9wbGFjZSk6IEFkZGVkLgorICAgICAg ICAoUGVyZlRlc3QubG9nX3N0YXRpc3RpY3Mucm91bmRfdG9fc2lnX2ZpZyk6IEFkZGVkLgorICAg ICAgICAoUGVyZlRlc3QubG9nX3N0YXRpc3RpY3MpOiBSb3VuZCBkZWNpbWFsIHBvaW50cyB0byB0 aGUgc2lnbmlmaWNhbnQgZmlndXJlcyBvZgorICAgICAgICB0aGUgc2FtcGxlIHN0YW5kYXJkIGRl dmlhdGlvbiBhcyBzaG93aW5nIG1vcmUgc2lnbmlmaWNhbnQgZmlndXJlcyBkb2Vzbid0IGRvIGFu eSBnb29kLgorCisgICAgICAgIChDaHJvbWl1bVN0eWxlUGVyZlRlc3QucGFyc2VfYW5kX2xvZ19v dXRwdXQpOiBVc2UgdGhlIG1ldHJpYyBuYW1lIHRvIHN0b3JlIHJlc3VsdHMgYXMgZG9uZSBpbiBQ ZXJmVGVzdC5ydW4uCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rl c3RzL3BlcmZ0ZXN0X3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFBlcmZUZXN0TWV0cmljLnRl c3RfaW5pdF9zZXRfdGltZV9tZXRyaWMpOgorICAgICAgICAoVGVzdFBlcmZUZXN0TWV0cmljLmxl Z2FjeV9jaHJvbWl1bV9ib3RfY29tcGF0aWJsZV90ZXN0X25hbWUpOiBSZW1vdmVkLiBUaGUgaW50 ZWdyYXRpb24gdGVzdHMgdGVzdCB0aGlzLgorICAgICAgICAoVGVzdFJlcGxheVBlcmZUZXN0LnRl c3RfcnVuX3dpdGhfZHJpdmVyX2FjY3VtdWxhdGVzX3Jlc3VsdHMpOgorICAgICAgICAoVGVzdFJl cGxheVBlcmZUZXN0LnRlc3RfcnVuX3dpdGhfZHJpdmVyX2FjY3VtdWxhdGVzX21lbW9yeV9yZXN1 bHRzKToKKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVy ZnRlc3RzcnVubmVyLnB5OgorICAgICAgICAoUGVyZlRlc3RzUnVubmVyLl9faW5pdF9fKToKKyAg ICAgICAgKFBlcmZUZXN0c1J1bm5lci5fZ2VuZXJhdGVfcmVzdWx0c19kaWN0KTogVXBkYXRlZCB0 byBpdGVyYXRlIG92ZXIgKHRlc3QsIG1ldHJpY3MpIHBhaXIuIFVzZSB2aWV3X3NvdXJjZV91cmwK KyAgICAgICAgdG8gb2J0YWluIHRoZSB0cmFjIFVSTCBpbnN0ZWFkIG9mIGhhcmQgY29kaW5nIGl0 LgorICAgICAgICAoUGVyZlRlc3RzUnVubmVyLl9ydW5fdGVzdHNfc2V0KToKKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX2ludGVn cmF0aW9udGVzdC5weTogVXBkYXRlZCBleHBlY3RlZCBvdXRwdXRzIG5vdyB0aGF0CisgICAgICAg IHdlIHJvdW5kIHN0YXRpc3RpY3MgaW4gYWNjb3JkYW5jZSB0byB0aGUgc2FtcGxlIHN0YW5kYXJk IGRldmlhdGlvbi4KKwogMjAxMy0wMy0wMSAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdAYXBwbGUu Y29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEFkZCBhbiBleHRyYSBwcm9qZWN0IHRoYXQgYXNz ZW1ibGVzIGFsbCBwcm9qZWN0IGJ1aWxkIGxvZ3Mgb24gV2luZG93cyBpbnRvIGEgc2luZ2xlIGZp bGUuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0 ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2Vf dGVzdHMvcGVyZnRlc3QucHkJKHJldmlzaW9uIDE0NDQ3OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTU5 LDE3ICs1OSwxMiBAQCBjbGFzcyBQZXJmVGVzdE1ldHJpYyhvYmplY3QpOgogICAgICAgICBzZWxm Ll91bml0ID0gdW5pdCBvciBzZWxmLm1ldHJpY190b191bml0KG1ldHJpYykKICAgICAgICAgc2Vs Zi5fbWV0cmljID0gc2VsZi50aW1lX3VuaXRfdG9fbWV0cmljKHNlbGYuX3VuaXQpIGlmIG1ldHJp YyA9PSAnVGltZScgZWxzZSBtZXRyaWMKIAotICAgIGRlZiBtZXRyaWMoc2VsZik6CisgICAgZGVm IG5hbWUoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9tZXRyaWMKIAogICAgIGRlZiBoYXNf dmFsdWVzKHNlbGYpOgogICAgICAgICByZXR1cm4gYm9vbChzZWxmLl9pdGVyYXRpb25zKQogCi0g ICAgIyBGSVhNRTogV2UgZG9uJ3QgbmVlZCB0byBzdXBwb3J0IHRoaXMgYW55bW9yZS4gTWFrZSBv dXRwdXRzIG1vcmUgaHVtYW4gZnJpZW5kbHkuCi0gICAgZGVmIGxlZ2FjeV9jaHJvbWl1bV9ib3Rf Y29tcGF0aWJsZV90ZXN0X25hbWUoc2VsZiwgdGVzdF9uYW1lX3dpdGhfZXh0ZW5zaW9uKToKLSAg ICAgICAgdGVzdF9uYW1lID0gcmUuc3ViKHInXC5cdyskJywgJycsIHRlc3RfbmFtZV93aXRoX2V4 dGVuc2lvbikKLSAgICAgICAgcmV0dXJuIHRlc3RfbmFtZSArICc6JyArIHNlbGYuX21ldHJpYwot CiAgICAgZGVmIGFwcGVuZChzZWxmLCB2YWx1ZSk6CiAgICAgICAgIHNlbGYuX2l0ZXJhdGlvbnMu YXBwZW5kKHZhbHVlKQogCkBAIC05OSw2ICs5NCw5IEBAIGNsYXNzIFBlcmZUZXN0KG9iamVjdCk6 CiAgICAgZGVmIHRlc3RfbmFtZShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3Rlc3RfbmFt ZQogCisgICAgZGVmIHRlc3RfbmFtZV93aXRob3V0X2ZpbGVfZXh0ZW5zaW9uKHNlbGYpOgorICAg ICAgICByZXR1cm4gcmUuc3ViKHInXC5cdyskJywgJycsIHNlbGYudGVzdF9uYW1lKCkpCisKICAg ICBkZWYgdGVzdF9wYXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fdGVzdF9wYXRoCiAK QEAgLTEyNywxMCArMTI1LDEwIEBAIGNsYXNzIFBlcmZUZXN0KG9iamVjdCk6CiAKICAgICAgICAg cmVzdWx0cyA9IHt9CiAgICAgICAgIGZvciBtZXRyaWMgaW4gbWV0cmljczoKLSAgICAgICAgICAg IGxlZ2FjeV90ZXN0X25hbWUgPSBtZXRyaWMubGVnYWN5X2Nocm9taXVtX2JvdF9jb21wYXRpYmxl X3Rlc3RfbmFtZShzZWxmLnRlc3RfbmFtZSgpKQotICAgICAgICAgICAgcmVzdWx0c1tsZWdhY3lf dGVzdF9uYW1lXSA9IG1ldHJpYy5pdGVyYXRpb25fdmFsdWVzKCkKKyAgICAgICAgICAgIHJlc3Vs dHNbbWV0cmljLm5hbWUoKV0gPSBtZXRyaWMuaXRlcmF0aW9uX3ZhbHVlcygpCiAgICAgICAgICAg ICBpZiBzaG91bGRfbG9nOgotICAgICAgICAgICAgICAgIHNlbGYubG9nX3N0YXRpc3RpY3MobGVn YWN5X3Rlc3RfbmFtZS5yZXBsYWNlKCc6JywgJzogJykucmVwbGFjZSgnLycsICc6ICcpLAorICAg ICAgICAgICAgICAgIGxlZ2FjeV9jaHJvbWl1bV9ib3RfY29tcGF0aWJsZV9uYW1lID0gc2VsZi50 ZXN0X25hbWVfd2l0aG91dF9maWxlX2V4dGVuc2lvbigpLnJlcGxhY2UoJy8nLCAnOiAnKQorICAg ICAgICAgICAgICAgIHNlbGYubG9nX3N0YXRpc3RpY3MobGVnYWN5X2Nocm9taXVtX2JvdF9jb21w YXRpYmxlX25hbWUgKyAnOiAnICsgbWV0cmljLm5hbWUoKSwKICAgICAgICAgICAgICAgICAgICAg bWV0cmljLml0ZXJhdGlvbl92YWx1ZXMoKSwgbWV0cmljLnVuaXQoKSkKIAogICAgICAgICByZXR1 cm4gcmVzdWx0cwpAQCAtMTUzLDkgKzE1MSwyMiBAQCBjbGFzcyBQZXJmVGVzdChvYmplY3QpOgog ICAgICAgICBtZWRpYW4gPSBzb3J0ZWRfdmFsdWVzW21pZGRsZV0gaWYgbGVuKHNvcnRlZF92YWx1 ZXMpICUgMiBlbHNlIChzb3J0ZWRfdmFsdWVzW21pZGRsZSAtIDFdICsgc29ydGVkX3ZhbHVlc1tt aWRkbGVdKSAvIDIKICAgICAgICAgc3RkZXYgPSBtYXRoLnNxcnQoc3F1YXJlX3N1bSAvIChsZW4o c29ydGVkX3ZhbHVlcykgLSAxKSkgaWYgbGVuKHNvcnRlZF92YWx1ZXMpID4gMSBlbHNlIDAKIAot ICAgICAgICBfbG9nLmluZm8oJ1JFU1VMVCAlcz0gJXMgJXMnICUgKHRlc3RfbmFtZSwgbWVhbiwg dW5pdCkpCi0gICAgICAgIF9sb2cuaW5mbygnbWVkaWFuPSAlcyAlcywgc3RkZXY9ICVzICVzLCBt aW49ICVzICVzLCBtYXg9ICVzICVzJyAlCi0gICAgICAgICAgICAobWVkaWFuLCB1bml0LCBzdGRl diwgdW5pdCwgc29ydGVkX3ZhbHVlc1swXSwgdW5pdCwgc29ydGVkX3ZhbHVlc1stMV0sIHVuaXQp KQorICAgICAgICBkZWYgaGlnaGVzdF9kZWNpbWFsX3BsYWNlKHgpOgorICAgICAgICAgICAgcmV0 dXJuIGludChtYXRoLmZsb29yKG1hdGgubG9nKHgsIDEwKSkpCisKKyAgICAgICAgZGVmIHJvdW5k X3RvX3NpZ19maWcoeCwgc2lnX2ZpZyk6CisgICAgICAgICAgICByZXR1cm4gcm91bmQoeCwgLWhp Z2hlc3RfZGVjaW1hbF9wbGFjZSh4KSArIHNpZ19maWcgLSAxKQorCisgICAgICAgIHN0ZGV2X2hp Z2hlc3RfZGVjaW1hbF9wbGFjZSA9IGhpZ2hlc3RfZGVjaW1hbF9wbGFjZShzdGRldikKKyAgICAg ICAgaWYgc3RkZXZfaGlnaGVzdF9kZWNpbWFsX3BsYWNlID49IDA6CisgICAgICAgICAgICByb3Vu ZF90b19zdGRldiA9IGxhbWJkYSB4OiBpbnQocm91bmQoeCkpCisgICAgICAgIGVsc2U6CisgICAg ICAgICAgICByb3VuZF90b19zdGRldiA9IGxhbWJkYSB4OiByb3VuZCh4LCAtc3RkZXZfaGlnaGVz dF9kZWNpbWFsX3BsYWNlKQorCisgICAgICAgIF9sb2cuaW5mbygnUkVTVUxUICVzPSAlcyAlcycg JSAodGVzdF9uYW1lLCByb3VuZF90b19zdGRldihtZWFuKSwgdW5pdCkpCisgICAgICAgIF9sb2cu aW5mbygnbWVkaWFuPSAlcyAlcywgc3RkZXY9ICVzICUlLCBtaW49ICVzICVzLCBtYXg9ICVzICVz JyAlCisgICAgICAgICAgICAocm91bmRfdG9fc3RkZXYobWVkaWFuKSwgdW5pdCwgcm91bmRfdG9f c2lnX2ZpZyhzdGRldiAvIG1lYW4gKiAxMDAsIDMpLAorICAgICAgICAgICAgcm91bmRfdG9fc3Rk ZXYoc29ydGVkX3ZhbHVlc1swXSksIHVuaXQsIHJvdW5kX3RvX3N0ZGV2KHNvcnRlZF92YWx1ZXNb LTFdKSwgdW5pdCkpCiAKICAgICBfZGVzY3JpcHRpb25fcmVnZXggPSByZS5jb21waWxlKHInXkRl c2NyaXB0aW9uOiAoP1A8ZGVzY3JpcHRpb24+LiopJCcsIHJlLklHTk9SRUNBU0UpCiAgICAgX21l dHJpY3NfcmVnZXggPSByZS5jb21waWxlKHInXig/UDxtZXRyaWM+VGltZXxNYWxsb2N8SlMgSGVh cCk6JykKQEAgLTI3NSw3ICsyODYsNyBAQCBjbGFzcyBDaHJvbWl1bVN0eWxlUGVyZlRlc3QoUGVy ZlRlc3QpOgogICAgICAgICAgICAgcmVzdWx0TGluZSA9IENocm9taXVtU3R5bGVQZXJmVGVzdC5f Y2hyb21pdW1fc3R5bGVfcmVzdWx0X3JlZ2V4Lm1hdGNoKGxpbmUpCiAgICAgICAgICAgICBpZiBy ZXN1bHRMaW5lOgogICAgICAgICAgICAgICAgICMgRklYTUU6IFN0b3JlIHRoZSB1bml0Ci0gICAg ICAgICAgICAgICAgcmVzdWx0c1tzZWxmLnRlc3RfbmFtZSgpICsgJzonICsgcmVzdWx0TGluZS5n cm91cCgnbmFtZScpLnJlcGxhY2UoJyAnLCAnJyldID0gZmxvYXQocmVzdWx0TGluZS5ncm91cCgn dmFsdWUnKSkKKyAgICAgICAgICAgICAgICByZXN1bHRzW3Jlc3VsdExpbmUuZ3JvdXAoJ25hbWUn KS5yZXBsYWNlKCcgJywgJycpXSA9IGZsb2F0KHJlc3VsdExpbmUuZ3JvdXAoJ3ZhbHVlJykpCiAg ICAgICAgICAgICAgICAgX2xvZy5pbmZvKGxpbmUpCiAgICAgICAgICAgICBlbGlmIG5vdCBsZW4o bGluZSkgPT0gMDoKICAgICAgICAgICAgICAgICB0ZXN0X2ZhaWxlZCA9IFRydWUKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RfdW5pdHRlc3Qu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0 cy9wZXJmdGVzdF91bml0dGVzdC5weQkocmV2aXNpb24gMTQ0NDc4KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdF91bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtNTUsMTUgKzU1LDkgQEAgY2xhc3MgVGVzdFBlcmZUZXN0TWV0cmljKHVuaXR0 ZXN0LlRlc3RDYQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFBlcmZUZXN0TWV0cmljKCdKU0hl YXAnLCBpdGVyYXRpb25zPVsxLCAyLCAzLCA0LCA1XSkudW5pdCgpLCAnYnl0ZXMnKQogCiAgICAg ZGVmIHRlc3RfaW5pdF9zZXRfdGltZV9tZXRyaWMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoUGVyZlRlc3RNZXRyaWMoJ1RpbWUnLCAnbXMnKS5tZXRyaWMoKSwgJ1RpbWUnKQotICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKFBlcmZUZXN0TWV0cmljKCdUaW1lJywgJ2ZwcycpLm1ldHJp YygpLCAnRnJhbWVSYXRlJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChQZXJmVGVzdE1ldHJp YygnVGltZScsICdydW5zL3MnKS5tZXRyaWMoKSwgJ1J1bnMnKQotCi0gICAgZGVmIHRlc3RfbGVn YWN5X2Nocm9taXVtX2JvdF9jb21wYXRpYmxlX3Rlc3RfbmFtZShzZWxmKToKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChQZXJmVGVzdE1ldHJpYygnVGltZScpLmxlZ2FjeV9jaHJvbWl1bV9ib3Rf Y29tcGF0aWJsZV90ZXN0X25hbWUoJ3Rlc3QnKSwgJ3Rlc3Q6VGltZScpCi0gICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoUGVyZlRlc3RNZXRyaWMoJ01hbGxvYycpLmxlZ2FjeV9jaHJvbWl1bV9ib3Rf Y29tcGF0aWJsZV90ZXN0X25hbWUoJ3Rlc3QnKSwgJ3Rlc3Q6TWFsbG9jJykKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChQZXJmVGVzdE1ldHJpYygnSlNIZWFwJykubGVnYWN5X2Nocm9taXVtX2Jv dF9jb21wYXRpYmxlX3Rlc3RfbmFtZSgndGVzdCcpLCAndGVzdDpKU0hlYXAnKQotICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKFBlcmZUZXN0TWV0cmljKCdGb250U2l6ZScsIHVuaXQ9J2VtJykubGVn YWN5X2Nocm9taXVtX2JvdF9jb21wYXRpYmxlX3Rlc3RfbmFtZSgndGVzdCcpLCAndGVzdDpGb250 U2l6ZScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoUGVyZlRlc3RNZXRyaWMoJ1RpbWUnLCAn bXMnKS5uYW1lKCksICdUaW1lJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChQZXJmVGVzdE1l dHJpYygnVGltZScsICdmcHMnKS5uYW1lKCksICdGcmFtZVJhdGUnKQorICAgICAgICBzZWxmLmFz c2VydEVxdWFsKFBlcmZUZXN0TWV0cmljKCdUaW1lJywgJ3J1bnMvcycpLm5hbWUoKSwgJ1J1bnMn KQogCiAgICAgZGVmIHRlc3RfaGFzX3ZhbHVlcyhzZWxmKToKICAgICAgICAgc2VsZi5hc3NlcnRG YWxzZShQZXJmVGVzdE1ldHJpYygnVGltZScpLmhhc192YWx1ZXMoKSkKQEAgLTMxNiw3ICszMTAs NyBAQCBjbGFzcyBUZXN0UmVwbGF5UGVyZlRlc3QodW5pdHRlc3QuVGVzdENhCiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoYWN0dWFsX2xvZ3MsICcnKQogCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwobGVuKG1ldHJpY3MpLCAxKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG1ldHJpY3NbMF0u bWV0cmljKCksICdUaW1lJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChtZXRyaWNzWzBdLm5h bWUoKSwgJ1RpbWUnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG1ldHJpY3NbMF0uaXRlcmF0 aW9uX3ZhbHVlcygpLCBbZmxvYXQoaSAqIDEwMDApIGZvciBpIGluIHJhbmdlKDIsIDIxKV0pCiAK ICAgICBkZWYgdGVzdF9ydW5fd2l0aF9kcml2ZXJfYWNjdW11bGF0ZXNfbWVtb3J5X3Jlc3VsdHMo c2VsZik6CkBAIC0zNDIsMTEgKzMzNiwxMSBAQCBjbGFzcyBUZXN0UmVwbGF5UGVyZlRlc3QodW5p dHRlc3QuVGVzdENhCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoYWN0dWFsX2xvZ3MsICcnKQog CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKG1ldHJpY3MpLCAzKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFsKG1ldHJpY3NbMF0ubWV0cmljKCksICdUaW1lJykKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChtZXRyaWNzWzBdLm5hbWUoKSwgJ1RpbWUnKQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKG1ldHJpY3NbMF0uaXRlcmF0aW9uX3ZhbHVlcygpLCBbZmxvYXQoaSAqIDEwMDApIGZv ciBpIGluIHJhbmdlKDIsIDIxKV0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWV0cmljc1sx XS5tZXRyaWMoKSwgJ01hbGxvYycpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWV0cmljc1sx XS5uYW1lKCksICdNYWxsb2MnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG1ldHJpY3NbMV0u aXRlcmF0aW9uX3ZhbHVlcygpLCBbZmxvYXQoMTApXSAqIDE5KQotICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKG1ldHJpY3NbMl0ubWV0cmljKCksICdKU0hlYXAnKQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKG1ldHJpY3NbMl0ubmFtZSgpLCAnSlNIZWFwJykKICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChtZXRyaWNzWzJdLml0ZXJhdGlvbl92YWx1ZXMoKSwgW2Zsb2F0KDUpXSAqIDE5KQogCiAg ICAgZGVmIHRlc3RfcHJlcGFyZV9mYWlsc193aGVuX3dhaXRfdW50aWxfcmVhZHlfZmFpbHMoc2Vs Zik6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0 ZXN0c3J1bm5lci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZv cm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQkocmV2aXNpb24gMTQ0NDc4KQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkJ KHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDcgQEAgaW1wb3J0IGRhdGV0aW1lCiAKIGZyb20g d2Via2l0cHkuY29tbW9uIGltcG9ydCBmaW5kX2ZpbGVzCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5j aGVja291dC5zY20uZGV0ZWN0aW9uIGltcG9ydCBTQ01EZXRlY3RvcgorZnJvbSB3ZWJraXRweS5j b21tb24uY29uZmlnLnVybHMgaW1wb3J0IHZpZXdfc291cmNlX3VybAogZnJvbSB3ZWJraXRweS5j b21tb24uaG9zdCBpbXBvcnQgSG9zdAogZnJvbSB3ZWJraXRweS5jb21tb24ubmV0LmZpbGVfdXBs b2FkZXIgaW1wb3J0IEZpbGVVcGxvYWRlcgogZnJvbSB3ZWJraXRweS5wZXJmb3JtYW5jZV90ZXN0 cy5wZXJmdGVzdCBpbXBvcnQgUGVyZlRlc3RGYWN0b3J5CkBAIC02NiwxMCArNjcsMTAgQEAgY2xh c3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2hvc3QuaW5pdGlhbGl6 ZV9zY20oKQogICAgICAgICBzZWxmLl93ZWJraXRfYmFzZV9kaXJfbGVuID0gbGVuKHNlbGYuX3Bv cnQud2Via2l0X2Jhc2UoKSkKICAgICAgICAgc2VsZi5fYmFzZV9wYXRoID0gc2VsZi5fcG9ydC5w ZXJmX3Rlc3RzX2RpcigpCi0gICAgICAgIHNlbGYuX3Jlc3VsdHMgPSB7fQogICAgICAgICBzZWxm Ll90aW1lc3RhbXAgPSB0aW1lLnRpbWUoKQogICAgICAgICBzZWxmLl91dGNfdGltZXN0YW1wID0g ZGF0ZXRpbWUuZGF0ZXRpbWUudXRjbm93KCkKIAorCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRl ZiBfcGFyc2VfYXJncyhhcmdzPU5vbmUpOgogICAgICAgICBkZWYgX2V4cGFuZF9wYXRoKG9wdGlv biwgb3B0X3N0ciwgdmFsdWUsIHBhcnNlcik6CkBAIC0yMzMsMTAgKzIzNCw2IEBAIGNsYXNzIFBl cmZUZXN0c1J1bm5lcihvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fcG9ydC5zaG93X3Jlc3Vs dHNfaHRtbF9maWxlKHJlc3VsdHNfcGFnZV9wYXRoKQogCiAgICAgZGVmIF9nZW5lcmF0ZV9yZXN1 bHRzX2RpY3Qoc2VsZiwgdGltZXN0YW1wLCBkZXNjcmlwdGlvbiwgcGxhdGZvcm0sIGJ1aWxkZXJf bmFtZSwgYnVpbGRfbnVtYmVyKToKLSAgICAgICAgY29udGVudHMgPSB7J3Rlc3RzJzoge319Ci0g ICAgICAgIGlmIGRlc2NyaXB0aW9uOgotICAgICAgICAgICAgY29udGVudHNbJ2Rlc2NyaXB0aW9u J10gPSBkZXNjcmlwdGlvbgotCiAgICAgICAgIHJldmlzaW9ucyA9IHt9CiAgICAgICAgIGZvciAo bmFtZSwgcGF0aCkgaW4gc2VsZi5fcG9ydC5yZXBvc2l0b3J5X3BhdGhzKCk6CiAgICAgICAgICAg ICBzY20gPSBTQ01EZXRlY3RvcihzZWxmLl9ob3N0LmZpbGVzeXN0ZW0sIHNlbGYuX2hvc3QuZXhl Y3V0aXZlKS5kZXRlY3Rfc2NtX3N5c3RlbShwYXRoKSBvciBzZWxmLl9ob3N0LnNjbSgpCkBAIC0y NDQsNDIgKzI0MSwzNyBAQCBjbGFzcyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToKICAgICAgICAg ICAgIHJldmlzaW9uc1tuYW1lXSA9IHsncmV2aXNpb24nOiBzdHIocmV2aXNpb24pLCAndGltZXN0 YW1wJzogc2NtLnRpbWVzdGFtcF9vZl9sYXRlc3RfY29tbWl0KHBhdGgsIHJldmlzaW9uKX0KIAog ICAgICAgICBtZXRhX2luZm8gPSB7CisgICAgICAgICAgICAnZGVzY3JpcHRpb24nOiBkZXNjcmlw dGlvbiwKICAgICAgICAgICAgICdidWlsZFRpbWUnOiBzZWxmLl9kYXRldGltZV9pbl9FUzVfY29t cGF0aWJsZV9pc29fZm9ybWF0KHNlbGYuX3V0Y190aW1lc3RhbXApLAogICAgICAgICAgICAgJ3Bs YXRmb3JtJzogcGxhdGZvcm0sCiAgICAgICAgICAgICAncmV2aXNpb25zJzogcmV2aXNpb25zLAog ICAgICAgICAgICAgJ2J1aWxkZXJOYW1lJzogYnVpbGRlcl9uYW1lLAogICAgICAgICAgICAgJ2J1 aWxkTnVtYmVyJzogaW50KGJ1aWxkX251bWJlcikgaWYgYnVpbGRfbnVtYmVyIGVsc2UgTm9uZX0K IAorICAgICAgICBjb250ZW50cyA9IHsndGVzdHMnOiB7fX0KICAgICAgICAgZm9yIGtleSwgdmFs dWUgaW4gbWV0YV9pbmZvLml0ZW1zKCk6CiAgICAgICAgICAgICBpZiB2YWx1ZToKICAgICAgICAg ICAgICAgICBjb250ZW50c1trZXldID0gdmFsdWUKIAotICAgICAgICAjIEZJWE1FOiBNYWtlIHRo aXMgZnVuY3Rpb24gc2hvcnRlciBvbmNlIHdlJ3ZlIHRyYW5zaXRpb25lZCB0byB1c2UgcGVyZi53 ZWJraXQub3JnLgotICAgICAgICBmb3IgbWV0cmljX2Z1bGxfbmFtZSwgaXRlcmF0aW9uX3ZhbHVl cyBpbiBzZWxmLl9yZXN1bHRzLml0ZXJpdGVtcygpOgotICAgICAgICAgICAgaWYgbm90IGlzaW5z dGFuY2UoaXRlcmF0aW9uX3ZhbHVlcywgbGlzdCk6ICAjIFdlIGNhbid0IHJlcG9ydHMgcmVzdWx0 cyB3aXRob3V0IGluZGl2aWR1YWwgbWVhc3VyZW1lbnRzLgotICAgICAgICAgICAgICAgIGNvbnRp bnVlCi0KLSAgICAgICAgICAgIGFzc2VydCBtZXRyaWNfZnVsbF9uYW1lLmNvdW50KCc6JykgPD0g MQotICAgICAgICAgICAgdGVzdF9mdWxsX25hbWUsIF8sIG1ldHJpYyA9IG1ldHJpY19mdWxsX25h bWUucGFydGl0aW9uKCc6JykKLQotICAgICAgICAgICAgdGVzdHMgPSBjb250ZW50c1sndGVzdHMn XQotICAgICAgICAgICAgcGF0aCA9IHRlc3RfZnVsbF9uYW1lLnNwbGl0KCcvJykKLSAgICAgICAg ICAgIGZvciBpIGluIHJhbmdlKDAsIGxlbihwYXRoKSk6Ci0gICAgICAgICAgICAgICAgIyBGSVhN RTogV2Ugc2hvdWxkbid0IGFzc3VtZSBIVE1MIGV4dGVuc2lvbi4KLSAgICAgICAgICAgICAgICBp c19sYXN0X3Rva2VuID0gaSArIDEgPT0gbGVuKHBhdGgpCi0gICAgICAgICAgICAgICAgdXJsID0g J2h0dHA6Ly90cmFjLndlYmtpdC5vcmcvYnJvd3Nlci90cnVuay9QZXJmb3JtYW5jZVRlc3RzLycg KyAnLycuam9pbihwYXRoWzA6aSArIDFdKQotICAgICAgICAgICAgICAgIGlmIGlzX2xhc3RfdG9r ZW46Ci0gICAgICAgICAgICAgICAgICAgIHVybCArPSAnLmh0bWwnCi0KLSAgICAgICAgICAgICAg ICB0ZXN0cy5zZXRkZWZhdWx0KHBhdGhbaV0sIHsndXJsJzogdXJsfSkKLSAgICAgICAgICAgICAg ICBjdXJyZW50X3Rlc3QgPSB0ZXN0c1twYXRoW2ldXQotICAgICAgICAgICAgICAgIGlmIGlzX2xh c3RfdG9rZW46Ci0gICAgICAgICAgICAgICAgICAgIGN1cnJlbnRfdGVzdC5zZXRkZWZhdWx0KCdt ZXRyaWNzJywge30pCi0gICAgICAgICAgICAgICAgICAgIGFzc2VydCBtZXRyaWMgbm90IGluIGN1 cnJlbnRfdGVzdFsnbWV0cmljcyddCi0gICAgICAgICAgICAgICAgICAgIGN1cnJlbnRfdGVzdFsn bWV0cmljcyddW21ldHJpY10gPSB7J2N1cnJlbnQnOiBpdGVyYXRpb25fdmFsdWVzfQotICAgICAg ICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgICAgIGN1cnJlbnRfdGVzdC5zZXRkZWZh dWx0KCd0ZXN0cycsIHt9KQotICAgICAgICAgICAgICAgICAgICB0ZXN0cyA9IGN1cnJlbnRfdGVz dFsndGVzdHMnXQorICAgICAgICBmb3IgdGVzdCwgbWV0cmljcyBpbiBzZWxmLl9yZXN1bHRzOgor ICAgICAgICAgICAgZm9yIG1ldHJpY19uYW1lLCBpdGVyYXRpb25fdmFsdWVzIGluIG1ldHJpY3Mu aXRlcml0ZW1zKCk6CisgICAgICAgICAgICAgICAgaWYgbm90IGlzaW5zdGFuY2UoaXRlcmF0aW9u X3ZhbHVlcywgbGlzdCk6ICAjIFdlIGNhbid0IHJlcG9ydHMgcmVzdWx0cyB3aXRob3V0IGluZGl2 aWR1YWwgbWVhc3VyZW1lbnRzLgorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorCisgICAg ICAgICAgICAgICAgdGVzdHMgPSBjb250ZW50c1sndGVzdHMnXQorICAgICAgICAgICAgICAgIHBh dGggPSB0ZXN0LnRlc3RfbmFtZV93aXRob3V0X2ZpbGVfZXh0ZW5zaW9uKCkuc3BsaXQoJy8nKQor ICAgICAgICAgICAgICAgIGZvciBpIGluIHJhbmdlKDAsIGxlbihwYXRoKSk6CisgICAgICAgICAg ICAgICAgICAgIGlzX2xhc3RfdG9rZW4gPSBpICsgMSA9PSBsZW4ocGF0aCkKKyAgICAgICAgICAg ICAgICAgICAgdXJsID0gdmlld19zb3VyY2VfdXJsKCdQZXJmb3JtYW5jZVRlc3RzLycgKyAodGVz dC50ZXN0X25hbWUoKSBpZiBpc19sYXN0X3Rva2VuIGVsc2UgJy8nLmpvaW4ocGF0aFswOmkgKyAx XSkpKQorICAgICAgICAgICAgICAgICAgICB0ZXN0cy5zZXRkZWZhdWx0KHBhdGhbaV0sIHsndXJs JzogdXJsfSkKKyAgICAgICAgICAgICAgICAgICAgY3VycmVudF90ZXN0ID0gdGVzdHNbcGF0aFtp XV0KKyAgICAgICAgICAgICAgICAgICAgaWYgaXNfbGFzdF90b2tlbjoKKyAgICAgICAgICAgICAg ICAgICAgICAgIGN1cnJlbnRfdGVzdC5zZXRkZWZhdWx0KCdtZXRyaWNzJywge30pCisgICAgICAg ICAgICAgICAgICAgICAgICBhc3NlcnQgbWV0cmljX25hbWUgbm90IGluIGN1cnJlbnRfdGVzdFsn bWV0cmljcyddCisgICAgICAgICAgICAgICAgICAgICAgICBjdXJyZW50X3Rlc3RbJ21ldHJpY3Mn XVttZXRyaWNfbmFtZV0gPSB7J2N1cnJlbnQnOiBpdGVyYXRpb25fdmFsdWVzfQorICAgICAgICAg ICAgICAgICAgICBlbHNlOgorICAgICAgICAgICAgICAgICAgICAgICAgY3VycmVudF90ZXN0LnNl dGRlZmF1bHQoJ3Rlc3RzJywge30pCisgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0cyA9IGN1 cnJlbnRfdGVzdFsndGVzdHMnXQogCiAgICAgICAgIHJldHVybiBjb250ZW50cwogCkBAIC0zNTcs MTMgKzM0OSwxNCBAQCBjbGFzcyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToKICAgICBkZWYgX3J1 bl90ZXN0c19zZXQoc2VsZiwgdGVzdHMpOgogICAgICAgICByZXN1bHRfY291bnQgPSBsZW4odGVz dHMpCiAgICAgICAgIGZhaWx1cmVzID0gMAorICAgICAgICBzZWxmLl9yZXN1bHRzID0gW10KIAog ICAgICAgICBmb3IgaSwgdGVzdCBpbiBlbnVtZXJhdGUodGVzdHMpOgogICAgICAgICAgICAgX2xv Zy5pbmZvKCdSdW5uaW5nICVzICglZCBvZiAlZCknICUgKHRlc3QudGVzdF9uYW1lKCksIGkgKyAx LCBsZW4odGVzdHMpKSkKICAgICAgICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRpbWUoKQotICAg ICAgICAgICAgbmV3X3Jlc3VsdHMgPSB0ZXN0LnJ1bihzZWxmLl9vcHRpb25zLnRpbWVfb3V0X21z KQotICAgICAgICAgICAgaWYgbmV3X3Jlc3VsdHM6Ci0gICAgICAgICAgICAgICAgc2VsZi5fcmVz dWx0cy51cGRhdGUobmV3X3Jlc3VsdHMpCisgICAgICAgICAgICBtZXRyaWNzID0gdGVzdC5ydW4o c2VsZi5fb3B0aW9ucy50aW1lX291dF9tcykKKyAgICAgICAgICAgIGlmIG1ldHJpY3M6CisgICAg ICAgICAgICAgICAgc2VsZi5fcmVzdWx0cy5hcHBlbmQoKHRlc3QsIG1ldHJpY3MpKQogICAgICAg ICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBmYWlsdXJlcyArPSAxCiAgICAgICAgICAgICAg ICAgX2xvZy5lcnJvcignRkFJTEVEJykKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVy Zm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX2ludGVncmF0aW9udGVzdC5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0 c3J1bm5lcl9pbnRlZ3JhdGlvbnRlc3QucHkJKHJldmlzaW9uIDE0NDQ3OCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX2ludGVncmF0 aW9udGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtODYsOCArODYsOCBAQCBtYXggMTUxMCBtcwog IiIiCiAKICAgICBvdXRwdXQgPSAiIiJSdW5uaW5nIEJpbmRpbmdzL2V2ZW50LXRhcmdldC13cmFw cGVyLmh0bWwgKDEgb2YgMikKLVJFU1VMVCBCaW5kaW5nczogZXZlbnQtdGFyZ2V0LXdyYXBwZXI6 IFRpbWU9IDE0OTAuMCBtcwotbWVkaWFuPSAxNDg4LjAgbXMsIHN0ZGV2PSAxNS4xMzkzNSBtcywg bWluPSAxNDcxLjAgbXMsIG1heD0gMTUxMC4wIG1zCitSRVNVTFQgQmluZGluZ3M6IGV2ZW50LXRh cmdldC13cmFwcGVyOiBUaW1lPSAxNDkwIG1zCittZWRpYW49IDE0ODggbXMsIHN0ZGV2PSAxLjAy ICUsIG1pbj0gMTQ3MSBtcywgbWF4PSAxNTEwIG1zCiBGaW5pc2hlZDogMC4xIHMKIAogIiIiCkBA IC0xMDEsMTcgKzEwMSwxNyBAQCBjbGFzcyBTb21lUGFyc2VyVGVzdERhdGE6CiBJZ25vcmluZyB3 YXJtLXVwIHJ1biAoMTExNSkKIAogVGltZToKLXZhbHVlcyAxMDgwLCAxMTIwLCAxMDk1LCAxMTAx LCAxMTA0IG1zCi1hdmcgMTEwMCBtcwotbWVkaWFuIDExMDEgbXMKLXN0ZGV2IDE0LjUwODYxIG1z Ci1taW4gMTA4MCBtcwotbWF4IDExMjAgbXMKK3ZhbHVlcyAxMC44MywgMTEuMjAsIDEwLjk1LCAx MS4wMSwgMTEuMDQgbXMKK2F2ZyAxMS4wMSBtcworbWVkaWFuIDExLjAxIG1zCitzdGRldiAwLjEz NTAxIG1zCittaW4gMTAuODMgbXMKK21heCAxMS4yMCBtcwogIiIiCiAKICAgICBvdXRwdXQgPSAi IiJSdW5uaW5nIFBhcnNlci9zb21lLXBhcnNlci5odG1sICgyIG9mIDIpCi1SRVNVTFQgUGFyc2Vy OiBzb21lLXBhcnNlcjogVGltZT0gMTEwMC4wIG1zCi1tZWRpYW49IDExMDEuMCBtcywgc3RkZXY9 IDE0LjUwODYxIG1zLCBtaW49IDEwODAuMCBtcywgbWF4PSAxMTIwLjAgbXMKK1JFU1VMVCBQYXJz ZXI6IHNvbWUtcGFyc2VyOiBUaW1lPSAxMS4wIG1zCittZWRpYW49IDExLjAgbXMsIHN0ZGV2PSAx LjIzICUsIG1pbj0gMTAuOCBtcywgbWF4PSAxMS4yIG1zCiBGaW5pc2hlZDogMC4xIHMKIAogIiIi CkBAIC0xNDgsMTIgKzE0OCwxMiBAQCBtYXggNTQ4MDAwIGJ5dGVzCiAKICAgICBvdXRwdXQgPSAi IiJSdW5uaW5nIDEgdGVzdHMKIFJ1bm5pbmcgUGFyc2VyL21lbW9yeS10ZXN0Lmh0bWwgKDEgb2Yg MSkKLVJFU1VMVCBQYXJzZXI6IG1lbW9yeS10ZXN0OiBUaW1lPSAxMTAwLjAgbXMKLW1lZGlhbj0g MTEwMS4wIG1zLCBzdGRldj0gMTQuNTA4NjEgbXMsIG1pbj0gMTA4MC4wIG1zLCBtYXg9IDExMjAu MCBtcwotUkVTVUxUIFBhcnNlcjogbWVtb3J5LXRlc3Q6IEpTSGVhcD0gODMwMDAwLjAgYnl0ZXMK LW1lZGlhbj0gODI5MDAwLjAgYnl0ZXMsIHN0ZGV2PSAxMzc4NC4wNDg3NSBieXRlcywgbWluPSA4 MTEwMDAuMCBieXRlcywgbWF4PSA4NDgwMDAuMCBieXRlcwotUkVTVUxUIFBhcnNlcjogbWVtb3J5 LXRlc3Q6IE1hbGxvYz0gNTI5MDAwLjAgYnl0ZXMKLW1lZGlhbj0gNTI5MDAwLjAgYnl0ZXMsIHN0 ZGV2PSAxNDEyNC40NDY4OSBieXRlcywgbWluPSA1MTEwMDAuMCBieXRlcywgbWF4PSA1NDgwMDAu MCBieXRlcworUkVTVUxUIFBhcnNlcjogbWVtb3J5LXRlc3Q6IFRpbWU9IDExMDAgbXMKK21lZGlh bj0gMTEwMSBtcywgc3RkZXY9IDEuMzIgJSwgbWluPSAxMDgwIG1zLCBtYXg9IDExMjAgbXMKK1JF U1VMVCBQYXJzZXI6IG1lbW9yeS10ZXN0OiBKU0hlYXA9IDgzMDAwMCBieXRlcworbWVkaWFuPSA4 MjkwMDAgYnl0ZXMsIHN0ZGV2PSAxLjY2ICUsIG1pbj0gODExMDAwIGJ5dGVzLCBtYXg9IDg0ODAw MCBieXRlcworUkVTVUxUIFBhcnNlcjogbWVtb3J5LXRlc3Q6IE1hbGxvYz0gNTI5MDAwIGJ5dGVz CittZWRpYW49IDUyOTAwMCBieXRlcywgc3RkZXY9IDIuNjcgJSwgbWluPSA1MTEwMDAgYnl0ZXMs IG1heD0gNTQ4MDAwIGJ5dGVzCiBGaW5pc2hlZDogMC4xIHMKICIiIgogCg== 191043 2013-03-01 14:51:45 -0800 2013-03-01 14:54:26 -0800 Reverted log_statistics change bug-111148-20130301144757.patch text/plain 12632 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE0NDUwNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDEzLTAzLTAxICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIERvbuKAmXQgdXNlIGxlZ2FjeSB0ZXN0IG5hbWVzIHdoZW4gcmV0dXJuaW5nIHJl c3VsdHMgZnJvbSBQZXJmVGVzdC5ydW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExMTE0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJm dGVzdC5weToKKyAgICAgICAgKFBlcmZUZXN0TWV0cmljLm5hbWUpOiBSZW5hbWVkIGZyb20gbWV0 cmljLgorICAgICAgICAoUGVyZlRlc3QudGVzdF9uYW1lX3dpdGhvdXRfZmlsZV9leHRlbnNpb24p OiBFeHRyYWN0ZWQgZnJvbSBsZWdhY3lfY2hyb21pdW1fYm90X2NvbXBhdGlibGVfdGVzdF9uYW1l LgorICAgICAgICAoUGVyZlRlc3QucnVuKTogVXNlIG1ldHJpYyBuYW1lIGluc3RlYWQgb2YgdGhl IGxlZ2FjeSBuYW1lIHRvIHN0b3JlIGl0ZXJhdGlvbiB2YWx1ZXMuCisgICAgICAgIChDaHJvbWl1 bVN0eWxlUGVyZlRlc3QucGFyc2VfYW5kX2xvZ19vdXRwdXQpOiBVc2UgdGhlIG1ldHJpYyBuYW1l IHRvIHN0b3JlIHJlc3VsdHMgYXMgZG9uZSBpbiBQZXJmVGVzdC5ydW4uCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0X3VuaXR0ZXN0LnB5Ogor ICAgICAgICAoVGVzdFBlcmZUZXN0TWV0cmljLnRlc3RfaW5pdF9zZXRfdGltZV9tZXRyaWMpOgor ICAgICAgICAoVGVzdFBlcmZUZXN0TWV0cmljLmxlZ2FjeV9jaHJvbWl1bV9ib3RfY29tcGF0aWJs ZV90ZXN0X25hbWUpOiBSZW1vdmVkLiBUaGUgaW50ZWdyYXRpb24gdGVzdHMgdGVzdCB0aGlzLgor ICAgICAgICAoVGVzdFJlcGxheVBlcmZUZXN0LnRlc3RfcnVuX3dpdGhfZHJpdmVyX2FjY3VtdWxh dGVzX3Jlc3VsdHMpOgorICAgICAgICAoVGVzdFJlcGxheVBlcmZUZXN0LnRlc3RfcnVuX3dpdGhf ZHJpdmVyX2FjY3VtdWxhdGVzX21lbW9yeV9yZXN1bHRzKToKKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5OgorICAgICAgICAo UGVyZlRlc3RzUnVubmVyLl9faW5pdF9fKToKKyAgICAgICAgKFBlcmZUZXN0c1J1bm5lci5fZ2Vu ZXJhdGVfcmVzdWx0c19kaWN0KTogVXBkYXRlZCB0byBpdGVyYXRlIG92ZXIgKHRlc3QsIG1ldHJp Y3MpIHBhaXIuIFVzZSB2aWV3X3NvdXJjZV91cmwKKyAgICAgICAgdG8gb2J0YWluIHRoZSB0cmFj IFVSTCBpbnN0ZWFkIG9mIGhhcmQgY29kaW5nIGl0LgorICAgICAgICAoUGVyZlRlc3RzUnVubmVy Ll9ydW5fdGVzdHNfc2V0KToKKwogMjAxMy0wMy0wMSAgUm9nZXIgRm9uZyAgPHJvZ2VyX2ZvbmdA YXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEFkZCBhbiBleHRyYSBwcm9qZWN0IHRo YXQgYXNzZW1ibGVzIGFsbCBwcm9qZWN0IGJ1aWxkIGxvZ3Mgb24gV2luZG93cyBpbnRvIGEgc2lu Z2xlIGZpbGUuCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3Rz L3BlcmZ0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9y bWFuY2VfdGVzdHMvcGVyZnRlc3QucHkJKHJldmlzaW9uIDE0NDQ3OCkKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3QucHkJKHdvcmtpbmcgY29weSkK QEAgLTU5LDE3ICs1OSwxMiBAQCBjbGFzcyBQZXJmVGVzdE1ldHJpYyhvYmplY3QpOgogICAgICAg ICBzZWxmLl91bml0ID0gdW5pdCBvciBzZWxmLm1ldHJpY190b191bml0KG1ldHJpYykKICAgICAg ICAgc2VsZi5fbWV0cmljID0gc2VsZi50aW1lX3VuaXRfdG9fbWV0cmljKHNlbGYuX3VuaXQpIGlm IG1ldHJpYyA9PSAnVGltZScgZWxzZSBtZXRyaWMKIAotICAgIGRlZiBtZXRyaWMoc2VsZik6Cisg ICAgZGVmIG5hbWUoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9tZXRyaWMKIAogICAgIGRl ZiBoYXNfdmFsdWVzKHNlbGYpOgogICAgICAgICByZXR1cm4gYm9vbChzZWxmLl9pdGVyYXRpb25z KQogCi0gICAgIyBGSVhNRTogV2UgZG9uJ3QgbmVlZCB0byBzdXBwb3J0IHRoaXMgYW55bW9yZS4g TWFrZSBvdXRwdXRzIG1vcmUgaHVtYW4gZnJpZW5kbHkuCi0gICAgZGVmIGxlZ2FjeV9jaHJvbWl1 bV9ib3RfY29tcGF0aWJsZV90ZXN0X25hbWUoc2VsZiwgdGVzdF9uYW1lX3dpdGhfZXh0ZW5zaW9u KToKLSAgICAgICAgdGVzdF9uYW1lID0gcmUuc3ViKHInXC5cdyskJywgJycsIHRlc3RfbmFtZV93 aXRoX2V4dGVuc2lvbikKLSAgICAgICAgcmV0dXJuIHRlc3RfbmFtZSArICc6JyArIHNlbGYuX21l dHJpYwotCiAgICAgZGVmIGFwcGVuZChzZWxmLCB2YWx1ZSk6CiAgICAgICAgIHNlbGYuX2l0ZXJh dGlvbnMuYXBwZW5kKHZhbHVlKQogCkBAIC05OSw2ICs5NCw5IEBAIGNsYXNzIFBlcmZUZXN0KG9i amVjdCk6CiAgICAgZGVmIHRlc3RfbmFtZShzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3Rl c3RfbmFtZQogCisgICAgZGVmIHRlc3RfbmFtZV93aXRob3V0X2ZpbGVfZXh0ZW5zaW9uKHNlbGYp OgorICAgICAgICByZXR1cm4gcmUuc3ViKHInXC5cdyskJywgJycsIHNlbGYudGVzdF9uYW1lKCkp CisKICAgICBkZWYgdGVzdF9wYXRoKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fdGVzdF9w YXRoCiAKQEAgLTEyNywxMCArMTI1LDEwIEBAIGNsYXNzIFBlcmZUZXN0KG9iamVjdCk6CiAKICAg ICAgICAgcmVzdWx0cyA9IHt9CiAgICAgICAgIGZvciBtZXRyaWMgaW4gbWV0cmljczoKLSAgICAg ICAgICAgIGxlZ2FjeV90ZXN0X25hbWUgPSBtZXRyaWMubGVnYWN5X2Nocm9taXVtX2JvdF9jb21w YXRpYmxlX3Rlc3RfbmFtZShzZWxmLnRlc3RfbmFtZSgpKQotICAgICAgICAgICAgcmVzdWx0c1ts ZWdhY3lfdGVzdF9uYW1lXSA9IG1ldHJpYy5pdGVyYXRpb25fdmFsdWVzKCkKKyAgICAgICAgICAg IHJlc3VsdHNbbWV0cmljLm5hbWUoKV0gPSBtZXRyaWMuaXRlcmF0aW9uX3ZhbHVlcygpCiAgICAg ICAgICAgICBpZiBzaG91bGRfbG9nOgotICAgICAgICAgICAgICAgIHNlbGYubG9nX3N0YXRpc3Rp Y3MobGVnYWN5X3Rlc3RfbmFtZS5yZXBsYWNlKCc6JywgJzogJykucmVwbGFjZSgnLycsICc6ICcp LAorICAgICAgICAgICAgICAgIGxlZ2FjeV9jaHJvbWl1bV9ib3RfY29tcGF0aWJsZV9uYW1lID0g c2VsZi50ZXN0X25hbWVfd2l0aG91dF9maWxlX2V4dGVuc2lvbigpLnJlcGxhY2UoJy8nLCAnOiAn KQorICAgICAgICAgICAgICAgIHNlbGYubG9nX3N0YXRpc3RpY3MobGVnYWN5X2Nocm9taXVtX2Jv dF9jb21wYXRpYmxlX25hbWUgKyAnOiAnICsgbWV0cmljLm5hbWUoKSwKICAgICAgICAgICAgICAg ICAgICAgbWV0cmljLml0ZXJhdGlvbl92YWx1ZXMoKSwgbWV0cmljLnVuaXQoKSkKIAogICAgICAg ICByZXR1cm4gcmVzdWx0cwpAQCAtMjc1LDcgKzI3Myw3IEBAIGNsYXNzIENocm9taXVtU3R5bGVQ ZXJmVGVzdChQZXJmVGVzdCk6CiAgICAgICAgICAgICByZXN1bHRMaW5lID0gQ2hyb21pdW1TdHls ZVBlcmZUZXN0Ll9jaHJvbWl1bV9zdHlsZV9yZXN1bHRfcmVnZXgubWF0Y2gobGluZSkKICAgICAg ICAgICAgIGlmIHJlc3VsdExpbmU6CiAgICAgICAgICAgICAgICAgIyBGSVhNRTogU3RvcmUgdGhl IHVuaXQKLSAgICAgICAgICAgICAgICByZXN1bHRzW3NlbGYudGVzdF9uYW1lKCkgKyAnOicgKyBy ZXN1bHRMaW5lLmdyb3VwKCduYW1lJykucmVwbGFjZSgnICcsICcnKV0gPSBmbG9hdChyZXN1bHRM aW5lLmdyb3VwKCd2YWx1ZScpKQorICAgICAgICAgICAgICAgIHJlc3VsdHNbcmVzdWx0TGluZS5n cm91cCgnbmFtZScpLnJlcGxhY2UoJyAnLCAnJyldID0gZmxvYXQocmVzdWx0TGluZS5ncm91cCgn dmFsdWUnKSkKICAgICAgICAgICAgICAgICBfbG9nLmluZm8obGluZSkKICAgICAgICAgICAgIGVs aWYgbm90IGxlbihsaW5lKSA9PSAwOgogICAgICAgICAgICAgICAgIHRlc3RfZmFpbGVkID0gVHJ1 ZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVz dF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZv cm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxNDQ0NzgpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0X3VuaXR0ZXN0 LnB5CSh3b3JraW5nIGNvcHkpCkBAIC01NSwxNSArNTUsOSBAQCBjbGFzcyBUZXN0UGVyZlRlc3RN ZXRyaWModW5pdHRlc3QuVGVzdENhCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoUGVyZlRlc3RN ZXRyaWMoJ0pTSGVhcCcsIGl0ZXJhdGlvbnM9WzEsIDIsIDMsIDQsIDVdKS51bml0KCksICdieXRl cycpCiAKICAgICBkZWYgdGVzdF9pbml0X3NldF90aW1lX21ldHJpYyhzZWxmKToKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChQZXJmVGVzdE1ldHJpYygnVGltZScsICdtcycpLm1ldHJpYygpLCAn VGltZScpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoUGVyZlRlc3RNZXRyaWMoJ1RpbWUnLCAn ZnBzJykubWV0cmljKCksICdGcmFtZVJhdGUnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFBl cmZUZXN0TWV0cmljKCdUaW1lJywgJ3J1bnMvcycpLm1ldHJpYygpLCAnUnVucycpCi0KLSAgICBk ZWYgdGVzdF9sZWdhY3lfY2hyb21pdW1fYm90X2NvbXBhdGlibGVfdGVzdF9uYW1lKHNlbGYpOgot ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFBlcmZUZXN0TWV0cmljKCdUaW1lJykubGVnYWN5X2No cm9taXVtX2JvdF9jb21wYXRpYmxlX3Rlc3RfbmFtZSgndGVzdCcpLCAndGVzdDpUaW1lJykKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChQZXJmVGVzdE1ldHJpYygnTWFsbG9jJykubGVnYWN5X2No cm9taXVtX2JvdF9jb21wYXRpYmxlX3Rlc3RfbmFtZSgndGVzdCcpLCAndGVzdDpNYWxsb2MnKQot ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFBlcmZUZXN0TWV0cmljKCdKU0hlYXAnKS5sZWdhY3lf Y2hyb21pdW1fYm90X2NvbXBhdGlibGVfdGVzdF9uYW1lKCd0ZXN0JyksICd0ZXN0OkpTSGVhcCcp Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoUGVyZlRlc3RNZXRyaWMoJ0ZvbnRTaXplJywgdW5p dD0nZW0nKS5sZWdhY3lfY2hyb21pdW1fYm90X2NvbXBhdGlibGVfdGVzdF9uYW1lKCd0ZXN0Jyks ICd0ZXN0OkZvbnRTaXplJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChQZXJmVGVzdE1ldHJp YygnVGltZScsICdtcycpLm5hbWUoKSwgJ1RpbWUnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KFBlcmZUZXN0TWV0cmljKCdUaW1lJywgJ2ZwcycpLm5hbWUoKSwgJ0ZyYW1lUmF0ZScpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoUGVyZlRlc3RNZXRyaWMoJ1RpbWUnLCAncnVucy9zJykubmFt ZSgpLCAnUnVucycpCiAKICAgICBkZWYgdGVzdF9oYXNfdmFsdWVzKHNlbGYpOgogICAgICAgICBz ZWxmLmFzc2VydEZhbHNlKFBlcmZUZXN0TWV0cmljKCdUaW1lJykuaGFzX3ZhbHVlcygpKQpAQCAt MzE2LDcgKzMxMCw3IEBAIGNsYXNzIFRlc3RSZXBsYXlQZXJmVGVzdCh1bml0dGVzdC5UZXN0Q2EK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChhY3R1YWxfbG9ncywgJycpCiAKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChsZW4obWV0cmljcyksIDEpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo bWV0cmljc1swXS5tZXRyaWMoKSwgJ1RpbWUnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKG1l dHJpY3NbMF0ubmFtZSgpLCAnVGltZScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWV0cmlj c1swXS5pdGVyYXRpb25fdmFsdWVzKCksIFtmbG9hdChpICogMTAwMCkgZm9yIGkgaW4gcmFuZ2Uo MiwgMjEpXSkKIAogICAgIGRlZiB0ZXN0X3J1bl93aXRoX2RyaXZlcl9hY2N1bXVsYXRlc19tZW1v cnlfcmVzdWx0cyhzZWxmKToKQEAgLTM0MiwxMSArMzM2LDExIEBAIGNsYXNzIFRlc3RSZXBsYXlQ ZXJmVGVzdCh1bml0dGVzdC5UZXN0Q2EKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChhY3R1YWxf bG9ncywgJycpCiAKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4obWV0cmljcyksIDMpCi0g ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobWV0cmljc1swXS5tZXRyaWMoKSwgJ1RpbWUnKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKG1ldHJpY3NbMF0ubmFtZSgpLCAnVGltZScpCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwobWV0cmljc1swXS5pdGVyYXRpb25fdmFsdWVzKCksIFtmbG9hdChp ICogMTAwMCkgZm9yIGkgaW4gcmFuZ2UoMiwgMjEpXSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChtZXRyaWNzWzFdLm1ldHJpYygpLCAnTWFsbG9jJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChtZXRyaWNzWzFdLm5hbWUoKSwgJ01hbGxvYycpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo bWV0cmljc1sxXS5pdGVyYXRpb25fdmFsdWVzKCksIFtmbG9hdCgxMCldICogMTkpCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwobWV0cmljc1syXS5tZXRyaWMoKSwgJ0pTSGVhcCcpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwobWV0cmljc1syXS5uYW1lKCksICdKU0hlYXAnKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKG1ldHJpY3NbMl0uaXRlcmF0aW9uX3ZhbHVlcygpLCBbZmxvYXQoNSld ICogMTkpCiAKICAgICBkZWYgdGVzdF9wcmVwYXJlX2ZhaWxzX3doZW5fd2FpdF91bnRpbF9yZWFk eV9mYWlscyhzZWxmKToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2Vf dGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5CShyZXZpc2lvbiAxNDQ0 NzgpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0 c3J1bm5lci5weQkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsNyBAQCBpbXBvcnQgZGF0ZXRp bWUKIAogZnJvbSB3ZWJraXRweS5jb21tb24gaW1wb3J0IGZpbmRfZmlsZXMKIGZyb20gd2Via2l0 cHkuY29tbW9uLmNoZWNrb3V0LnNjbS5kZXRlY3Rpb24gaW1wb3J0IFNDTURldGVjdG9yCitmcm9t IHdlYmtpdHB5LmNvbW1vbi5jb25maWcudXJscyBpbXBvcnQgdmlld19zb3VyY2VfdXJsCiBmcm9t IHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5u ZXQuZmlsZV91cGxvYWRlciBpbXBvcnQgRmlsZVVwbG9hZGVyCiBmcm9tIHdlYmtpdHB5LnBlcmZv cm1hbmNlX3Rlc3RzLnBlcmZ0ZXN0IGltcG9ydCBQZXJmVGVzdEZhY3RvcnkKQEAgLTY2LDEwICs2 NywxMCBAQCBjbGFzcyBQZXJmVGVzdHNSdW5uZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5faG9z dC5pbml0aWFsaXplX3NjbSgpCiAgICAgICAgIHNlbGYuX3dlYmtpdF9iYXNlX2Rpcl9sZW4gPSBs ZW4oc2VsZi5fcG9ydC53ZWJraXRfYmFzZSgpKQogICAgICAgICBzZWxmLl9iYXNlX3BhdGggPSBz ZWxmLl9wb3J0LnBlcmZfdGVzdHNfZGlyKCkKLSAgICAgICAgc2VsZi5fcmVzdWx0cyA9IHt9CiAg ICAgICAgIHNlbGYuX3RpbWVzdGFtcCA9IHRpbWUudGltZSgpCiAgICAgICAgIHNlbGYuX3V0Y190 aW1lc3RhbXAgPSBkYXRldGltZS5kYXRldGltZS51dGNub3coKQogCisKICAgICBAc3RhdGljbWV0 aG9kCiAgICAgZGVmIF9wYXJzZV9hcmdzKGFyZ3M9Tm9uZSk6CiAgICAgICAgIGRlZiBfZXhwYW5k X3BhdGgob3B0aW9uLCBvcHRfc3RyLCB2YWx1ZSwgcGFyc2VyKToKQEAgLTIzMywxMCArMjM0LDYg QEAgY2xhc3MgUGVyZlRlc3RzUnVubmVyKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9wb3J0 LnNob3dfcmVzdWx0c19odG1sX2ZpbGUocmVzdWx0c19wYWdlX3BhdGgpCiAKICAgICBkZWYgX2dl bmVyYXRlX3Jlc3VsdHNfZGljdChzZWxmLCB0aW1lc3RhbXAsIGRlc2NyaXB0aW9uLCBwbGF0Zm9y bSwgYnVpbGRlcl9uYW1lLCBidWlsZF9udW1iZXIpOgotICAgICAgICBjb250ZW50cyA9IHsndGVz dHMnOiB7fX0KLSAgICAgICAgaWYgZGVzY3JpcHRpb246Ci0gICAgICAgICAgICBjb250ZW50c1sn ZGVzY3JpcHRpb24nXSA9IGRlc2NyaXB0aW9uCi0KICAgICAgICAgcmV2aXNpb25zID0ge30KICAg ICAgICAgZm9yIChuYW1lLCBwYXRoKSBpbiBzZWxmLl9wb3J0LnJlcG9zaXRvcnlfcGF0aHMoKToK ICAgICAgICAgICAgIHNjbSA9IFNDTURldGVjdG9yKHNlbGYuX2hvc3QuZmlsZXN5c3RlbSwgc2Vs Zi5faG9zdC5leGVjdXRpdmUpLmRldGVjdF9zY21fc3lzdGVtKHBhdGgpIG9yIHNlbGYuX2hvc3Qu c2NtKCkKQEAgLTI0NCw0MiArMjQxLDM3IEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5lcihvYmplY3Qp OgogICAgICAgICAgICAgcmV2aXNpb25zW25hbWVdID0geydyZXZpc2lvbic6IHN0cihyZXZpc2lv biksICd0aW1lc3RhbXAnOiBzY20udGltZXN0YW1wX29mX2xhdGVzdF9jb21taXQocGF0aCwgcmV2 aXNpb24pfQogCiAgICAgICAgIG1ldGFfaW5mbyA9IHsKKyAgICAgICAgICAgICdkZXNjcmlwdGlv bic6IGRlc2NyaXB0aW9uLAogICAgICAgICAgICAgJ2J1aWxkVGltZSc6IHNlbGYuX2RhdGV0aW1l X2luX0VTNV9jb21wYXRpYmxlX2lzb19mb3JtYXQoc2VsZi5fdXRjX3RpbWVzdGFtcCksCiAgICAg ICAgICAgICAncGxhdGZvcm0nOiBwbGF0Zm9ybSwKICAgICAgICAgICAgICdyZXZpc2lvbnMnOiBy ZXZpc2lvbnMsCiAgICAgICAgICAgICAnYnVpbGRlck5hbWUnOiBidWlsZGVyX25hbWUsCiAgICAg ICAgICAgICAnYnVpbGROdW1iZXInOiBpbnQoYnVpbGRfbnVtYmVyKSBpZiBidWlsZF9udW1iZXIg ZWxzZSBOb25lfQogCisgICAgICAgIGNvbnRlbnRzID0geyd0ZXN0cyc6IHt9fQogICAgICAgICBm b3Iga2V5LCB2YWx1ZSBpbiBtZXRhX2luZm8uaXRlbXMoKToKICAgICAgICAgICAgIGlmIHZhbHVl OgogICAgICAgICAgICAgICAgIGNvbnRlbnRzW2tleV0gPSB2YWx1ZQogCi0gICAgICAgICMgRklY TUU6IE1ha2UgdGhpcyBmdW5jdGlvbiBzaG9ydGVyIG9uY2Ugd2UndmUgdHJhbnNpdGlvbmVkIHRv IHVzZSBwZXJmLndlYmtpdC5vcmcuCi0gICAgICAgIGZvciBtZXRyaWNfZnVsbF9uYW1lLCBpdGVy YXRpb25fdmFsdWVzIGluIHNlbGYuX3Jlc3VsdHMuaXRlcml0ZW1zKCk6Ci0gICAgICAgICAgICBp ZiBub3QgaXNpbnN0YW5jZShpdGVyYXRpb25fdmFsdWVzLCBsaXN0KTogICMgV2UgY2FuJ3QgcmVw b3J0cyByZXN1bHRzIHdpdGhvdXQgaW5kaXZpZHVhbCBtZWFzdXJlbWVudHMuCi0gICAgICAgICAg ICAgICAgY29udGludWUKLQotICAgICAgICAgICAgYXNzZXJ0IG1ldHJpY19mdWxsX25hbWUuY291 bnQoJzonKSA8PSAxCi0gICAgICAgICAgICB0ZXN0X2Z1bGxfbmFtZSwgXywgbWV0cmljID0gbWV0 cmljX2Z1bGxfbmFtZS5wYXJ0aXRpb24oJzonKQotCi0gICAgICAgICAgICB0ZXN0cyA9IGNvbnRl bnRzWyd0ZXN0cyddCi0gICAgICAgICAgICBwYXRoID0gdGVzdF9mdWxsX25hbWUuc3BsaXQoJy8n KQotICAgICAgICAgICAgZm9yIGkgaW4gcmFuZ2UoMCwgbGVuKHBhdGgpKToKLSAgICAgICAgICAg ICAgICAjIEZJWE1FOiBXZSBzaG91bGRuJ3QgYXNzdW1lIEhUTUwgZXh0ZW5zaW9uLgotICAgICAg ICAgICAgICAgIGlzX2xhc3RfdG9rZW4gPSBpICsgMSA9PSBsZW4ocGF0aCkKLSAgICAgICAgICAg ICAgICB1cmwgPSAnaHR0cDovL3RyYWMud2Via2l0Lm9yZy9icm93c2VyL3RydW5rL1BlcmZvcm1h bmNlVGVzdHMvJyArICcvJy5qb2luKHBhdGhbMDppICsgMV0pCi0gICAgICAgICAgICAgICAgaWYg aXNfbGFzdF90b2tlbjoKLSAgICAgICAgICAgICAgICAgICAgdXJsICs9ICcuaHRtbCcKLQotICAg ICAgICAgICAgICAgIHRlc3RzLnNldGRlZmF1bHQocGF0aFtpXSwgeyd1cmwnOiB1cmx9KQotICAg ICAgICAgICAgICAgIGN1cnJlbnRfdGVzdCA9IHRlc3RzW3BhdGhbaV1dCi0gICAgICAgICAgICAg ICAgaWYgaXNfbGFzdF90b2tlbjoKLSAgICAgICAgICAgICAgICAgICAgY3VycmVudF90ZXN0LnNl dGRlZmF1bHQoJ21ldHJpY3MnLCB7fSkKLSAgICAgICAgICAgICAgICAgICAgYXNzZXJ0IG1ldHJp YyBub3QgaW4gY3VycmVudF90ZXN0WydtZXRyaWNzJ10KLSAgICAgICAgICAgICAgICAgICAgY3Vy cmVudF90ZXN0WydtZXRyaWNzJ11bbWV0cmljXSA9IHsnY3VycmVudCc6IGl0ZXJhdGlvbl92YWx1 ZXN9Ci0gICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgY3VycmVudF90 ZXN0LnNldGRlZmF1bHQoJ3Rlc3RzJywge30pCi0gICAgICAgICAgICAgICAgICAgIHRlc3RzID0g Y3VycmVudF90ZXN0Wyd0ZXN0cyddCisgICAgICAgIGZvciB0ZXN0LCBtZXRyaWNzIGluIHNlbGYu X3Jlc3VsdHM6CisgICAgICAgICAgICBmb3IgbWV0cmljX25hbWUsIGl0ZXJhdGlvbl92YWx1ZXMg aW4gbWV0cmljcy5pdGVyaXRlbXMoKToKKyAgICAgICAgICAgICAgICBpZiBub3QgaXNpbnN0YW5j ZShpdGVyYXRpb25fdmFsdWVzLCBsaXN0KTogICMgV2UgY2FuJ3QgcmVwb3J0cyByZXN1bHRzIHdp dGhvdXQgaW5kaXZpZHVhbCBtZWFzdXJlbWVudHMuCisgICAgICAgICAgICAgICAgICAgIGNvbnRp bnVlCisKKyAgICAgICAgICAgICAgICB0ZXN0cyA9IGNvbnRlbnRzWyd0ZXN0cyddCisgICAgICAg ICAgICAgICAgcGF0aCA9IHRlc3QudGVzdF9uYW1lX3dpdGhvdXRfZmlsZV9leHRlbnNpb24oKS5z cGxpdCgnLycpCisgICAgICAgICAgICAgICAgZm9yIGkgaW4gcmFuZ2UoMCwgbGVuKHBhdGgpKToK KyAgICAgICAgICAgICAgICAgICAgaXNfbGFzdF90b2tlbiA9IGkgKyAxID09IGxlbihwYXRoKQor ICAgICAgICAgICAgICAgICAgICB1cmwgPSB2aWV3X3NvdXJjZV91cmwoJ1BlcmZvcm1hbmNlVGVz dHMvJyArICh0ZXN0LnRlc3RfbmFtZSgpIGlmIGlzX2xhc3RfdG9rZW4gZWxzZSAnLycuam9pbihw YXRoWzA6aSArIDFdKSkpCisgICAgICAgICAgICAgICAgICAgIHRlc3RzLnNldGRlZmF1bHQocGF0 aFtpXSwgeyd1cmwnOiB1cmx9KQorICAgICAgICAgICAgICAgICAgICBjdXJyZW50X3Rlc3QgPSB0 ZXN0c1twYXRoW2ldXQorICAgICAgICAgICAgICAgICAgICBpZiBpc19sYXN0X3Rva2VuOgorICAg ICAgICAgICAgICAgICAgICAgICAgY3VycmVudF90ZXN0LnNldGRlZmF1bHQoJ21ldHJpY3MnLCB7 fSkKKyAgICAgICAgICAgICAgICAgICAgICAgIGFzc2VydCBtZXRyaWNfbmFtZSBub3QgaW4gY3Vy cmVudF90ZXN0WydtZXRyaWNzJ10KKyAgICAgICAgICAgICAgICAgICAgICAgIGN1cnJlbnRfdGVz dFsnbWV0cmljcyddW21ldHJpY19uYW1lXSA9IHsnY3VycmVudCc6IGl0ZXJhdGlvbl92YWx1ZXN9 CisgICAgICAgICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAgICAgICBjdXJy ZW50X3Rlc3Quc2V0ZGVmYXVsdCgndGVzdHMnLCB7fSkKKyAgICAgICAgICAgICAgICAgICAgICAg IHRlc3RzID0gY3VycmVudF90ZXN0Wyd0ZXN0cyddCiAKICAgICAgICAgcmV0dXJuIGNvbnRlbnRz CiAKQEAgLTM1NywxMyArMzQ5LDE0IEBAIGNsYXNzIFBlcmZUZXN0c1J1bm5lcihvYmplY3QpOgog ICAgIGRlZiBfcnVuX3Rlc3RzX3NldChzZWxmLCB0ZXN0cyk6CiAgICAgICAgIHJlc3VsdF9jb3Vu dCA9IGxlbih0ZXN0cykKICAgICAgICAgZmFpbHVyZXMgPSAwCisgICAgICAgIHNlbGYuX3Jlc3Vs dHMgPSBbXQogCiAgICAgICAgIGZvciBpLCB0ZXN0IGluIGVudW1lcmF0ZSh0ZXN0cyk6CiAgICAg ICAgICAgICBfbG9nLmluZm8oJ1J1bm5pbmcgJXMgKCVkIG9mICVkKScgJSAodGVzdC50ZXN0X25h bWUoKSwgaSArIDEsIGxlbih0ZXN0cykpKQogICAgICAgICAgICAgc3RhcnRfdGltZSA9IHRpbWUu dGltZSgpCi0gICAgICAgICAgICBuZXdfcmVzdWx0cyA9IHRlc3QucnVuKHNlbGYuX29wdGlvbnMu dGltZV9vdXRfbXMpCi0gICAgICAgICAgICBpZiBuZXdfcmVzdWx0czoKLSAgICAgICAgICAgICAg ICBzZWxmLl9yZXN1bHRzLnVwZGF0ZShuZXdfcmVzdWx0cykKKyAgICAgICAgICAgIG1ldHJpY3Mg PSB0ZXN0LnJ1bihzZWxmLl9vcHRpb25zLnRpbWVfb3V0X21zKQorICAgICAgICAgICAgaWYgbWV0 cmljczoKKyAgICAgICAgICAgICAgICBzZWxmLl9yZXN1bHRzLmFwcGVuZCgodGVzdCwgbWV0cmlj cykpCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIGZhaWx1cmVzICs9IDEKICAg ICAgICAgICAgICAgICBfbG9nLmVycm9yKCdGQUlMRUQnKQo=