152289 2015-12-14 19:39:40 -0800 Using fake timestamp in OS version make some results invisible 2015-12-14 21:16:14 -0800 1 1 1 Unclassified WebKit WebKit Website WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez dewei_zhu jond kling koivisto timothy oldest_to_newest 1149179 0 rniwa 2015-12-14 19:39:40 -0800 Using fake timestamp for OS versions makes some results with only OS versions (e.g. baseline) to be treated as if they're measured 10 years ago. This is clearly not helpful. Order OS versions using some other mechanism. 1149180 1 267336 rniwa 2015-12-14 19:46:22 -0800 Created attachment 267336 Fixes the bug 1149186 2 rniwa 2015-12-14 20:07:07 -0800 Committed r194088: <http://trac.webkit.org/changeset/194088> 1149194 3 rniwa 2015-12-14 20:45:21 -0800 Not quite fixed :( 1149200 4 267340 rniwa 2015-12-14 21:03:26 -0800 Created attachment 267340 Fix more bugs 1149203 5 rniwa 2015-12-14 21:16:14 -0800 Committed r194093: <http://trac.webkit.org/changeset/194093> 267336 2015-12-14 19:46:22 -0800 2015-12-14 21:03:22 -0800 Fixes the bug bug-152289-20151214194546.patch text/plain 6804 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0MDg2KQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMxIEBACisyMDE1LTEyLTE0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFVzaW5nIGZha2UgdGltZXN0YW1wIGluIE9TIHZlcnNpb24gbWFrZSBzb21lIHJl c3VsdHMgaW52aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTIyODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGRlZCBjb21taXRfb3JkZXIgY29sdW1uIHRvIGV4cGxpY2l0bHkgb3JkZXIgT1Mg dmVyc2lvbnMuIFRoaXMgZml4ZXMgdGhlIGJ1ZyB3aGVyZWJ5IHdoaWNoCisgICAgICAgIGJhc2Vs aW5lIHJlc3VsdHMgcmVwb3J0ZWQgd2l0aCBvbmx5IE9TIHZlcnNpb25zIGFyZSBzaG93biB3aXRo IHggY29vcmRpbmF0ZSBzZXQgdG8gMTAgeWVhcnMgYWdvLgorCisgICAgICAgIFRvIG1pZ3JhdGUg dGhlIGV4aXN0aW5nIGRhdGFiYXNlLCBydW46CisgICAgICAgICAgICBBTFRFUiBUQUJMRSBjb21t aXRzIEFERCBDT0xVTU4gY29tbWl0X29yZGVyIGludGVnZXI7CisgICAgICAgICAgICBDUkVBVEUg SU5ERVggY29tbWl0X29yZGVyX2luZGV4IE9OIGNvbW1pdHMoY29tbWl0X29yZGVyKTsKKworICAg ICAgICBUaGVuIGZvciBlYWNoIHJlcG9zaXRvcnkgJDEsCisgICAgICAgICAgICBVUERBVEUgY29t bWl0cyBTRVQgKGNvbW1pdF90aW1lLCBjb21taXRfb3JkZXIpID0gKE5VTEwsIENBU1QoRVhUUkFD VChlcG9jaCBmcm9tIGNvbW1pdF90aW1lKSBhcyBpbnRlZ2VyKSkKKyAgICAgICAgICAgIFdIRVJF IGNvbW1pdF9yZXBvc2l0b3J5ID0gJDE7CisKKworICAgICAgICAqIGluaXQtZGF0YWJhc2Uuc3Fs OiBBZGRlZCB0aGUgY29sdW1uLgorICAgICAgICAqIHB1YmxpYy9hcGkvY29tbWl0cy5waHA6Cisg ICAgICAgIChmZXRjaF9jb21taXRzX2JldHdlZW4pOiBVc2UgY29tbWl0X29yZGVyIHRvIG9yZGVy IGNvbW1pdHMgd2hlbiBjb21taXRfdGltZSBpcyBtaXNzaW5nLgorICAgICAgICAqIHB1YmxpYy9h cGkvcmVwb3J0LWNvbW1pdHMucGhwOgorICAgICAgICAobWFpbik6IFNldCBjb21taXRfb3JkZXIu CisgICAgICAgICogdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5weToKKyAgICAgICAgKE9TQnVpbGRG ZXRjaGVyLmZldGNoX2FuZF9yZXBvcnRfbmV3X2J1aWxkcyk6CisgICAgICAgIChPU0J1aWxkRmV0 Y2hlci5fYXNzaWduX29yZGVyKTogUmVuYW1lZCBmcm9tIF9hc3NpZ25fZmFrZV90aW1lc3RhbXBz LiBTZXQgdGhlIG9yZGVyIGluc3RlYWQgb2YgYSBmYWtlIHRpbWVzdG1hcC4KKwogMjAxNS0xMi0x NCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBQZXJmIGRhc2hi b2FyZCBjYW4ndCBtZXJnZSB3aGVuIHRoZSBkZXN0aW5hdGlvbiBwbGF0Zm9ybSBpcyBtaXNzaW5n IGJhc2VsaW5lL3RhcmdldApJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL2luaXQtZGF0 YWJhc2Uuc3FsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9pbml0LWRh dGFiYXNlLnNxbAkocmV2aXNpb24gMTk0MDg1KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L2luaXQtZGF0YWJhc2Uuc3FsCSh3b3JraW5nIGNvcHkpCkBAIC04NywxMSArODcsMTMgQEAgQ1JF QVRFIFRBQkxFIGNvbW1pdHMgKAogICAgIGNvbW1pdF9yZXZpc2lvbiB2YXJjaGFyKDY0KSBOT1Qg TlVMTCwKICAgICBjb21taXRfcGFyZW50IGludGVnZXIgUkVGRVJFTkNFUyBjb21taXRzIE9OIERF TEVURSBDQVNDQURFLAogICAgIGNvbW1pdF90aW1lIHRpbWVzdGFtcCwKKyAgICBjb21taXRfb3Jk ZXIgaW50ZWdlciwKICAgICBjb21taXRfY29tbWl0dGVyIGludGVnZXIgUkVGRVJFTkNFUyBjb21t aXR0ZXJzIE9OIERFTEVURSBDQVNDQURFLAogICAgIGNvbW1pdF9tZXNzYWdlIHRleHQsCiAgICAg Y29tbWl0X3JlcG9ydGVkIGJvb2xlYW4gTk9UIE5VTEwgREVGQVVMVCBGQUxTRSwKICAgICBDT05T VFJBSU5UIGNvbW1pdF9pbl9yZXBvc2l0b3J5X211c3RfYmVfdW5pcXVlIFVOSVFVRShjb21taXRf cmVwb3NpdG9yeSwgY29tbWl0X3JldmlzaW9uKSk7CiBDUkVBVEUgSU5ERVggY29tbWl0X3RpbWVf aW5kZXggT04gY29tbWl0cyhjb21taXRfdGltZSk7CitDUkVBVEUgSU5ERVggY29tbWl0X29yZGVy X2luZGV4IE9OIGNvbW1pdHMoY29tbWl0X29yZGVyKTsKIAogQ1JFQVRFIFRBQkxFIGJ1aWxkX2Nv bW1pdHMgKAogICAgIGNvbW1pdF9idWlsZCBpbnRlZ2VyIE5PVCBOVUxMIFJFRkVSRU5DRVMgYnVp bGRzIE9OIERFTEVURSBDQVNDQURFLApJbmRleDogV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1 YmxpYy9hcGkvY29tbWl0cy5waHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy9hcGkvY29tbWl0cy5waHAJKHJldmlzaW9uIDE5NDA4NSkKKysrIFdlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvYXBpL2NvbW1pdHMucGhwCSh3b3JraW5nIGNvcHkpCkBA IC03OSwxMSArNzksMTggQEAgZnVuY3Rpb24gZmV0Y2hfY29tbWl0c19iZXR3ZWVuKCRkYiwgJHJl cAogICAgICAgICAkc2Vjb25kX2NvbW1pdCA9IGNvbW1pdF9mcm9tX3JldmlzaW9uKCRkYiwgJHJl cG9zaXRvcnlfaWQsICRzZWNvbmQpOwogICAgICAgICAkZmlyc3QgPSAkZmlyc3RfY29tbWl0Wydj b21taXRfdGltZSddOwogICAgICAgICAkc2Vjb25kID0gJHNlY29uZF9jb21taXRbJ2NvbW1pdF90 aW1lJ107CisgICAgICAgICRjb2x1bW5fbmFtZSA9ICdjb21taXRfdGltZSc7CisgICAgICAgIGlm ICghJGZpcnN0IHx8ICEkc2Vjb25kKSB7CisgICAgICAgICAgICAkZmlyc3QgPSAkZmlyc3RfY29t bWl0Wydjb21taXRfb3JkZXInXTsKKyAgICAgICAgICAgICRzZWNvbmQgPSAkc2Vjb25kX2NvbW1p dFsnY29tbWl0X29yZGVyJ107CisgICAgICAgICAgICAkY29sdW1uX25hbWUgPSAnY29tbWl0X29y ZGVyJzsKKyAgICAgICAgfQorCiAgICAgICAgICRpbl9vcmRlciA9ICRmaXJzdCA8ICRzZWNvbmQ7 CiAgICAgICAgIGFycmF5X3B1c2goJHZhbHVlcywgJGluX29yZGVyID8gJGZpcnN0IDogJHNlY29u ZCk7Ci0gICAgICAgICRzdGF0ZW1lbnRzIC49ICcgQU5EIGNvbW1pdF90aW1lID49ICQnIC4gY291 bnQoJHZhbHVlcyk7CisgICAgICAgICRzdGF0ZW1lbnRzIC49ICcgQU5EICcgLiAkY29sdW1uX25h bWUgLiAnID49ICQnIC4gY291bnQoJHZhbHVlcyk7CiAgICAgICAgIGFycmF5X3B1c2goJHZhbHVl cywgJGluX29yZGVyID8gJHNlY29uZCA6ICRmaXJzdCk7Ci0gICAgICAgICRzdGF0ZW1lbnRzIC49 ICcgQU5EIGNvbW1pdF90aW1lIDw9ICQnIC4gY291bnQoJHZhbHVlcyk7CisgICAgICAgICRzdGF0 ZW1lbnRzIC49ICcgQU5EICcgLiAkY29sdW1uX25hbWUgLiAnIDw9ICQnIC4gY291bnQoJHZhbHVl cyk7CiAgICAgfQogCiAgICAgaWYgKCRrZXl3b3JkKSB7CkBAIC05NSw3ICsxMDIsNyBAQCBmdW5j dGlvbiBmZXRjaF9jb21taXRzX2JldHdlZW4oJGRiLCAkcmVwCiAgICAgICAgICAgICBBTkQgKChj b21taXR0ZXJfbmFtZSBMSUtFICRrZXl3b3JkX2luZGV4IE9SIGNvbW1pdHRlcl9hY2NvdW50IExJ S0UgJGtleXdvcmRfaW5kZXgpIE9SIGNvbW1pdF9yZXZpc2lvbiA9ICRyZXZpc2lvbl9pbmRleCki OwogICAgIH0KIAotICAgICRjb21taXRzID0gJGRiLT5xdWVyeV9hbmRfZmV0Y2hfYWxsKCRzdGF0 ZW1lbnRzIC4gJyBPUkRFUiBCWSBjb21taXRfdGltZScsICR2YWx1ZXMpOworICAgICRjb21taXRz ID0gJGRiLT5xdWVyeV9hbmRfZmV0Y2hfYWxsKCRzdGF0ZW1lbnRzIC4gJyBPUkRFUiBCWSBjb21t aXRfdGltZSwgY29tbWl0X29yZGVyJywgJHZhbHVlcyk7CiAgICAgaWYgKCFpc19hcnJheSgkY29t bWl0cykpCiAgICAgICAgIGV4aXRfd2l0aF9lcnJvcignRmFpbGVkVG9GZXRjaENvbW1pdHMnLCBh cnJheSgncmVwb3NpdG9yeScgPT4gJHJlcG9zaXRvcnlfaWQsICdmaXJzdCcgPT4gJGZpcnN0LCAn c2Vjb25kJyA9PiAkc2Vjb25kKSk7CiAgICAgZm9yZWFjaCAoJGNvbW1pdHMgYXMgJiRjb21taXQp CkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2FwaS9yZXBvcnQtY29tbWl0 cy5waHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hcGkv cmVwb3J0LWNvbW1pdHMucGhwCShyZXZpc2lvbiAxOTQwODUpCisrKyBXZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL2FwaS9yZXBvcnQtY29tbWl0cy5waHAJKHdvcmtpbmcgY29weSkKQEAg LTYyLDYgKzYyLDcgQEAgZnVuY3Rpb24gbWFpbigkcG9zdF9kYXRhKSB7CiAgICAgICAgICAgICAn cmVwb3NpdG9yeScgPT4gJHJlcG9zaXRvcnlfaWQsCiAgICAgICAgICAgICAncmV2aXNpb24nID0+ ICRjb21taXRfaW5mb1sncmV2aXNpb24nXSwKICAgICAgICAgICAgICdwYXJlbnQnID0+ICRwYXJl bnRfaWQsCisgICAgICAgICAgICAnb3JkZXInID0+IGFycmF5X2dldCgkY29tbWl0X2luZm8sICdv cmRlcicpLAogICAgICAgICAgICAgJ3RpbWUnID0+IGFycmF5X2dldCgkY29tbWl0X2luZm8sICd0 aW1lJyksCiAgICAgICAgICAgICAnY29tbWl0dGVyJyA9PiAkY29tbWl0dGVyX2lkLAogICAgICAg ICAgICAgJ21lc3NhZ2UnID0+IGFycmF5X2dldCgkY29tbWl0X2luZm8sICdtZXNzYWdlJyksCklu ZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJz aW9ucy5weQkocmV2aXNpb24gMTk0MDg1KQorKysgV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rv b2xzL3B1bGwtb3MtdmVyc2lvbnMucHkJKHdvcmtpbmcgY29weSkKQEAgLTY0LDE0ICs2NCwxNCBA QCBjbGFzcyBPU0J1aWxkRmV0Y2hlcjoKICAgICAgICAgcHJpbnQgJ0ZvdW5kICVkIGJ1aWxkcycg JSBsZW4oYXZhaWxhYmxlX2J1aWxkcykKIAogICAgICAgICBhdmFpbGFibGVfYnVpbGRzID0gZmls dGVyKGxhbWJkYSBjb21taXQ6IGNvbW1pdFsncmV2aXNpb24nXSBub3QgaW4gcmVwb3J0ZWRfcmV2 aXNpb25zLCBhdmFpbGFibGVfYnVpbGRzKQotICAgICAgICBzZWxmLl9hc3NpZ25fZmFrZV90aW1l c3RhbXBzKGF2YWlsYWJsZV9idWlsZHMpCisgICAgICAgIHNlbGYuX2Fzc2lnbl9vcmRlcihhdmFp bGFibGVfYnVpbGRzKQogCiAgICAgICAgIHByaW50ICJTdWJtaXR0aW5nICVkIGJ1aWxkcyIgJSBs ZW4oYXZhaWxhYmxlX2J1aWxkcykKICAgICAgICAgc3VibWl0X2NvbW1pdHMoYXZhaWxhYmxlX2J1 aWxkcywgc2VydmVyX2NvbmZpZ1snc2VydmVyJ11bJ3VybCddLCBzZXJ2ZXJfY29uZmlnWydzbGF2 ZSddWyduYW1lJ10sIHNlcnZlcl9jb25maWdbJ3NsYXZlJ11bJ3Bhc3N3b3JkJ10pCiAgICAgICAg IHJlcG9ydGVkX3JldmlzaW9ucyB8PSBzZXQobWFwKGxhbWJkYSBjb21taXQ6IGNvbW1pdFsncmV2 aXNpb24nXSwgYXZhaWxhYmxlX2J1aWxkcykpCiAKICAgICBAc3RhdGljbWV0aG9kCi0gICAgZGVm IF9hc3NpZ25fZmFrZV90aW1lc3RhbXBzKGJ1aWxkcyk6CisgICAgZGVmIF9hc3NpZ25fb3JkZXIo YnVpbGRzKToKICAgICAgICAgYnVpbGRfbmFtZV9yZWdleCA9IHJlLmNvbXBpbGUocicoP1A8bWFq b3I+XGQrKSg/UDxraW5kPlx3KSg/UDxtaW5vcj5cZCspKD9QPHZhcmlhbnQ+XHcqKScpCiAgICAg ICAgIGZvciBjb21taXQgaW4gYnVpbGRzOgogICAgICAgICAgICAgbWF0Y2ggPSBidWlsZF9uYW1l X3JlZ2V4LnNlYXJjaChjb21taXRbJ3JldmlzaW9uJ10pCkBAIC04MSw3ICs4MSw3IEBAIGNsYXNz IE9TQnVpbGRGZXRjaGVyOgogICAgICAgICAgICAgdmFyaWFudCA9IG9yZChtYXRjaC5ncm91cCgn dmFyaWFudCcpLnVwcGVyKCkpIC0gb3JkKCdBJykgKyAxIGlmIG1hdGNoLmdyb3VwKCd2YXJpYW50 JykgZWxzZSAwCiAgICAgICAgICAgICAjIFRoZXNlIGZha2UgdGltZXMgd29uJ3QgY29uZmxpY3Qg d2l0aCByZWFsIGNvbW1pdCB0aW1lIHNpbmNlIGV2ZW4gOTlaOTk5OXogaXMgc3RpbGwgaW4gRmVi IDE5NzMKICAgICAgICAgICAgIGZha2VfdGltZSA9IGRhdGV0aW1lLnV0Y2Zyb210aW1lc3RhbXAo KG1ham9yICogMTAwICsga2luZCkgKiAxMDAwMCArIG1pbm9yICsgZmxvYXQodmFyaWFudCkgLyAx MDApCi0gICAgICAgICAgICBjb21taXRbJ3RpbWUnXSA9IGZha2VfdGltZS5pc29mb3JtYXQoKQor ICAgICAgICAgICAgY29tbWl0WydvcmRlciddID0gZmFrZV90aW1lLmlzb2Zvcm1hdCgpCiAKIAog ZGVmIGF2YWlsYWJsZV9idWlsZHNfZnJvbV9jb21tYW5kKHJlcG9zaXRvcnlfbmFtZSwgY29tbWFu ZCwgbGluZXNfdG9faWdub3JlKToK 267340 2015-12-14 21:03:26 -0800 2015-12-14 21:05:40 -0800 Fix more bugs bug-152289-20151214210249.patch text/plain 3847 rniwa SW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkocmV2aXNpb24gMTk0MDkyKQorKysg V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE1LTEyLTE0ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFVzaW5nIGZha2UgdGltZXN0YW1wIGluIE9TIHZlcnNpb24gbWFrZSBzb21lIHJl c3VsdHMgaW52aXNpYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTIyODkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBGaXggdmFyaW91cyBidWdzIGFmdGVyIHIxOTQwODguCisKKyAgICAgICAgKiBwdWJs aWMvYXBpL2NvbW1pdHMucGhwOgorICAgICAgICAoZm9ybWF0X2NvbW1pdCk6IEluY2x1ZGUgdGhl IGNvbW1pdCBvcmRlci4KKyAgICAgICAgKiBwdWJsaWMvdjIvZGF0YS5qczoKKyAgICAgICAgKENv bW1pdExvZ3MuX2NhY2hlQ29uc2VjdXRpdmVDb21taXRzKTogU29ydCBieSBjb21taXQgb3JkZXIg d2hlbiBjb21taXQgdGltZSBpcyBtaXNzaW5nLgorICAgICAgICAqIHRvb2xzL3B1bGwtb3MtdmVy c2lvbnMucHk6CisgICAgICAgIChPU0J1aWxkRmV0Y2hlci5fYXNzaWduX29yZGVyKTogVXNlIGlu dGVnZXIgaW5zdGVhZCBvZiBmYWtlIHRpbWUgZm9yIGNvbW1pdCBvcmRlci4KKyAgICAgICAgKGF2 YWlsYWJsZV9idWlsZHNfZnJvbV9jb21tYW5kKTogRXhpdCBlYXJseSB3aGVuIGFuIGV4Y2VwdGlv biBpcyB0aHJvd24uCisKIDIwMTUtMTItMTQgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5v cmc+CiAKICAgICAgICAgRml4IGEgdHlwbyBpbiB0aGUgcHJldmlvdXMgY29tbWl0LgpJbmRleDog V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hcGkvY29tbWl0cy5waHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9hcGkvY29tbWl0cy5waHAJKHJl dmlzaW9uIDE5NDA4OCkKKysrIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvYXBpL2Nv bW1pdHMucGhwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYsNiArMTE2LDcgQEAgZnVuY3Rpb24gZm9y bWF0X2NvbW1pdCgkY29tbWl0X3JvdywgJGNvbQogICAgICAgICAncmV2aXNpb24nID0+ICRjb21t aXRfcm93Wydjb21taXRfcmV2aXNpb24nXSwKICAgICAgICAgJ3BhcmVudCcgPT4gJGNvbW1pdF9y b3dbJ2NvbW1pdF9wYXJlbnQnXSwKICAgICAgICAgJ3RpbWUnID0+IERhdGFiYXNlOjp0b19qc190 aW1lKCRjb21taXRfcm93Wydjb21taXRfdGltZSddKSwKKyAgICAgICAgJ29yZGVyJyA9PiAkY29t bWl0X3Jvd1snY29tbWl0X29yZGVyJ10sCiAgICAgICAgICdhdXRob3JOYW1lJyA9PiAkY29tbWl0 dGVyX3JvdyA/ICRjb21taXR0ZXJfcm93Wydjb21taXR0ZXJfbmFtZSddIDogbnVsbCwKICAgICAg ICAgJ2F1dGhvckVtYWlsJyA9PiAkY29tbWl0dGVyX3JvdyA/ICRjb21taXR0ZXJfcm93Wydjb21t aXR0ZXJfYWNjb3VudCddIDogbnVsbCwKICAgICAgICAgJ21lc3NhZ2UnID0+ICRjb21taXRfcm93 Wydjb21taXRfbWVzc2FnZSddCkluZGV4OiBXZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L3YyL2RhdGEuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1Ymxp Yy92Mi9kYXRhLmpzCShyZXZpc2lvbiAxOTQwODUpCisrKyBXZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvcHVibGljL3YyL2RhdGEuanMJKHdvcmtpbmcgY29weSkKQEAgLTEzNiw3ICsxMzYsNyBAQCBD b21taXRMb2dzLl9jYWNoZUNvbnNlY3V0aXZlQ29tbWl0cyA9IGZ1CiAgICAgICAgIGNhY2hlZENv bW1pdHMuY29tbWl0c0J5VGltZS5wdXNoKGNvbW1pdCk7CiAgICAgfSk7CiAKLSAgICBjYWNoZWRD b21taXRzLmNvbW1pdHNCeVRpbWUuc29ydChmdW5jdGlvbiAoYSwgYikgeyByZXR1cm4gYS50aW1l IC0gYi50aW1lOyB9KTsKKyAgICBjYWNoZWRDb21taXRzLmNvbW1pdHNCeVRpbWUuc29ydChmdW5j dGlvbiAoYSwgYikgeyByZXR1cm4gYS50aW1lICYmIGIudGltZSA/IChhLnRpbWUgLSBiLnRpbWUp IDogKGEub3JkZXIgLSBiLm9yZGVyKTsgfSk7CiAgICAgY2FjaGVkQ29tbWl0cy5jb21taXRzQnlU aW1lLmZvckVhY2goZnVuY3Rpb24gKGNvbW1pdCwgaW5kZXgpIHsgY29tbWl0LmNhY2hlSW5kZXgg PSBpbmRleDsgfSk7CiB9CiAKSW5kZXg6IFdlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9w dWxsLW9zLXZlcnNpb25zLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy90b29scy9wdWxsLW9zLXZlcnNpb25zLnB5CShyZXZpc2lvbiAxOTQwODgpCisrKyBXZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvcHVsbC1vcy12ZXJzaW9ucy5weQkod29ya2luZyBjb3B5 KQpAQCAtNzksOSArNzksNyBAQCBjbGFzcyBPU0J1aWxkRmV0Y2hlcjoKICAgICAgICAgICAgIGtp bmQgPSBvcmQobWF0Y2guZ3JvdXAoJ2tpbmQnKS51cHBlcigpKSAtIG9yZCgnQScpCiAgICAgICAg ICAgICBtaW5vciA9IGludChtYXRjaC5ncm91cCgnbWlub3InKSkKICAgICAgICAgICAgIHZhcmlh bnQgPSBvcmQobWF0Y2guZ3JvdXAoJ3ZhcmlhbnQnKS51cHBlcigpKSAtIG9yZCgnQScpICsgMSBp ZiBtYXRjaC5ncm91cCgndmFyaWFudCcpIGVsc2UgMAotICAgICAgICAgICAgIyBUaGVzZSBmYWtl IHRpbWVzIHdvbid0IGNvbmZsaWN0IHdpdGggcmVhbCBjb21taXQgdGltZSBzaW5jZSBldmVuIDk5 Wjk5OTl6IGlzIHN0aWxsIGluIEZlYiAxOTczCi0gICAgICAgICAgICBmYWtlX3RpbWUgPSBkYXRl dGltZS51dGNmcm9tdGltZXN0YW1wKChtYWpvciAqIDEwMCArIGtpbmQpICogMTAwMDAgKyBtaW5v ciArIGZsb2F0KHZhcmlhbnQpIC8gMTAwKQotICAgICAgICAgICAgY29tbWl0WydvcmRlciddID0g ZmFrZV90aW1lLmlzb2Zvcm1hdCgpCisgICAgICAgICAgICBjb21taXRbJ29yZGVyJ10gPSAoKG1h am9yICogMTAwICsga2luZCkgKiAxMDAwMCArIG1pbm9yKSAqIDEwMCArIHZhcmlhbnQKIAogCiBk ZWYgYXZhaWxhYmxlX2J1aWxkc19mcm9tX2NvbW1hbmQocmVwb3NpdG9yeV9uYW1lLCBjb21tYW5k LCBsaW5lc190b19pZ25vcmUpOgpAQCAtODksNiArODcsNyBAQCBkZWYgYXZhaWxhYmxlX2J1aWxk c19mcm9tX2NvbW1hbmQocmVwb3NpCiAgICAgICAgIG91dHB1dCA9IHN1YnByb2Nlc3MuY2hlY2tf b3V0cHV0KGNvbW1hbmQsIHN0ZGVycj1zdWJwcm9jZXNzLlNURE9VVCkKICAgICBleGNlcHQgc3Vi cHJvY2Vzcy5DYWxsZWRQcm9jZXNzRXJyb3IgYXMgZXJyb3I6CiAgICAgICAgIHByaW50ICJGYWls ZWQ6Iiwgc3RyKGVycm9yKQorICAgICAgICByZXR1cm4gW10KIAogICAgIHJlZ2V4ID0gcmUuY29t cGlsZShsaW5lc190b19pZ25vcmUpCiAgICAgcmV0dXJuIFt7J3JlcG9zaXRvcnknOiByZXBvc2l0 b3J5X25hbWUsICdyZXZpc2lvbic6IGxpbmV9IGZvciBsaW5lIGluIG91dHB1dC5zcGxpdCgnXG4n KSBpZiBub3QgcmVnZXgubWF0Y2gobGluZSldCg==