37063 2010-04-03 14:01:40 -0700 Tighten SheriffBot's flaky test detector 2010-05-17 01:44:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 36911 1 abarth webkit-unassigned dbates eric oldest_to_newest 208303 0 abarth 2010-04-03 14:01:40 -0700 Tighten SheriffBot's flaky test detector 208305 1 52500 abarth 2010-04-03 14:08:20 -0700 Created attachment 52500 Patch 208366 2 abarth 2010-04-04 09:56:07 -0700 Need to add "Tests that caused the DumpRenderTree tool to crash:" as a results key. 208398 3 eric 2010-04-04 23:27:30 -0700 This patch really wants bug 36911 to be landed first. :) 208403 4 52518 abarth 2010-04-05 00:24:02 -0700 Created attachment 52518 Patch 208404 5 abarth 2010-04-05 00:25:00 -0700 Committed r57065: <http://trac.webkit.org/changeset/57065> 208405 6 abarth 2010-04-05 00:25:58 -0700 Sorry for landing this change unreviewed. I pulled over the relevant code from Bug 36911. I'm leaving this bug open so Eric can give me an after-the-fact review when he wakes up. 208680 7 52518 eric 2010-04-05 14:00:52 -0700 Comment on attachment 52518 Patch This really wanted bug 36911, since this is basicaly a re-write of that logic. :( test_no_results is wrong. Otherwise looks OK. 226668 8 dbates 2010-05-17 00:56:29 -0700 What is the status with this bug? Can we close it? 52500 2010-04-03 14:08:20 -0700 2010-04-05 00:23:58 -0700 Patch bug-37063-20100403140819.patch text/plain 12808 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlNTg4ODEyLi44YWRmMzUwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDQt MDMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaWdodGVuIFNoZXJpZmZCb3QncyBmbGFreSB0 ZXN0IGRldGVjdG9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNzA2MworCisgICAgICAgIEluc3RlYWQgb2YganVzdCBsb29raW5nIGZvciB0d28gc2Vx dWVudGlhbCByZWQgYnVpbGRzLCBsb29rIGZvciB0d28KKyAgICAgICAgc2VxdWVudGlhbCBmYWls dXJlcyBvZiB0aGUgc2FtZSB0ZXN0LiAgVGhpcyBzaG91bGQgcmVkdWNlIHNoZXJpZmZib3QKKyAg ICAgICAgZmFsc2UgcG9zaXRpdmUgc3Vic3RhbnRpYWxseS4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9uZXQvYnVpbGRib3RfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHk6CisKIDIwMTAtMDQtMDMgIENocmlzIEpl cmRvbmVrICA8Y2plcmRvbmVrQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2hp bmljaGlybyBIYW1hamkuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvYnVpbGRib3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9uZXQvYnVpbGRib3QucHkKaW5kZXggMjc2MGQzMS4uZWI4ZTUwZiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90LnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdC5weQpAQCAt MTM2LDM4ICsxMzYsNjMgQEAgY2xhc3MgQnVpbGRlcihvYmplY3QpOgogICAgICAgICAgICAgKQog ICAgICAgICByZXR1cm4gYnVpbGQKIAotICAgICMgRklYTUU6IFdlIHNob3VsZCBub3QgaGF2ZSB0 byBwYXNzIGEgcmVkX2J1aWxkX251bWJlciwgYnV0IHJhdGhlciBCdWlsZGVyIHNob3VsZAotICAg ICMga25vdyB3aGF0IGl0cyAibGF0ZXN0X2J1aWxkIiBpcy4KLSAgICBkZWYgZmluZF9ncmVlbl90 b19yZWRfdHJhbnNpdGlvbihzZWxmLCByZWRfYnVpbGRfbnVtYmVyLCBsb29rX2JhY2tfbGltaXQ9 MzApOgotICAgICAgICAjIHdhbGsgYmFja3dhcmRzIHVudGlsIHdlIGZpbmQgYSBncmVlbiBidWls ZAotICAgICAgICByZWRfYnVpbGQgPSBzZWxmLmJ1aWxkKHJlZF9idWlsZF9udW1iZXIpCi0gICAg ICAgIGdyZWVuX2J1aWxkID0gTm9uZQorICAgIGRlZiBmaW5kX2ZhaWx1cmVfdHJhbnNpdGlvbihz ZWxmLCByZWRfYnVpbGQsIGxvb2tfYmFja19saW1pdD0zMCk6CisgICAgICAgIGlmIG5vdCByZWRf YnVpbGQgb3IgcmVkX2J1aWxkLmlzX2dyZWVuKCk6CisgICAgICAgICAgICByZXR1cm4gKE5vbmUs IE5vbmUpCisgICAgICAgIGNvbW1vbl9mYWlsdXJlcyA9IE5vbmUKKyAgICAgICAgY3VycmVudF9i dWlsZCA9IHJlZF9idWlsZAorICAgICAgICBidWlsZF9hZnRlcl9jdXJyZW50X2J1aWxkID0gTm9u ZQogICAgICAgICBsb29rX2JhY2tfY291bnQgPSAwCi0gICAgICAgIHdoaWxlIHJlZF9idWlsZDoK LSAgICAgICAgICAgIGlmIGxvb2tfYmFja19jb3VudCA+PSBsb29rX2JhY2tfbGltaXQ6Ci0gICAg ICAgICAgICAgICAgYnJlYWsKLSAgICAgICAgICAgICMgVXNlIGEgcHJldmlvdXNfYnVpbGQoKSBt ZXRob2QgdG8gYXZvaWQgYXNzdW1pbmcgYnVpbGQgbnVtYmVycyBhcmUgc2VxdWVudGlhbC4KLSAg ICAgICAgICAgIGJlZm9yZV9yZWRfYnVpbGQgPSByZWRfYnVpbGQucHJldmlvdXNfYnVpbGQoKQot ICAgICAgICAgICAgaWYgYmVmb3JlX3JlZF9idWlsZCBhbmQgYmVmb3JlX3JlZF9idWlsZC5pc19n cmVlbigpOgotICAgICAgICAgICAgICAgIGdyZWVuX2J1aWxkID0gYmVmb3JlX3JlZF9idWlsZAor ICAgICAgICB3aGlsZSBjdXJyZW50X2J1aWxkOgorICAgICAgICAgICAgaWYgY3VycmVudF9idWls ZC5pc19ncmVlbigpOgorICAgICAgICAgICAgICAgICMgY3VycmVudF9idWlsZCBjYW4ndCBwb3Nz aWJseSBoYXZlIGFueSBmYWlsdXJlcyBpbiBjb21tb24KKyAgICAgICAgICAgICAgICAjIHdpdGgg cmVkX2J1aWxkIGJlY2F1c2UgaXQncyBncmVlbi4KICAgICAgICAgICAgICAgICBicmVhawotICAg ICAgICAgICAgcmVkX2J1aWxkID0gYmVmb3JlX3JlZF9idWlsZAorICAgICAgICAgICAgcmVzdWx0 cyA9IGN1cnJlbnRfYnVpbGQubGF5b3V0X3Rlc3RfcmVzdWx0cygpCisgICAgICAgICAgICAjIFdl IHRyZWF0IGEgbGFjayBvZiByZXN1bHRzIGFzIGlmIGFsbCB0aGUgdGVzdCBmYWlsZWQuCisgICAg ICAgICAgICAjIFRoaXMgb2NjdXJzLCBmb3IgZXhhbXBsZSwgd2hlbiB3ZSBjYW4ndCBjb21waWxl IGF0IGFsbC4KKyAgICAgICAgICAgIGlmIHJlc3VsdHM6CisgICAgICAgICAgICAgICAgZmFpbHVy ZXMgPSByZXN1bHRzLmZhaWxlZF9hbmRfdGltZWRfb3V0X3Rlc3RzKCkKKyAgICAgICAgICAgICAg ICBpZiBjb21tb25fZmFpbHVyZXMgPT0gTm9uZToKKyAgICAgICAgICAgICAgICAgICAgY29tbW9u X2ZhaWx1cmVzID0gZmFpbHVyZXMKKyAgICAgICAgICAgICAgICBjb21tb25fZmFpbHVyZXMgPSBj b21tb25fZmFpbHVyZXMuaW50ZXJzZWN0aW9uKGZhaWx1cmVzKQorICAgICAgICAgICAgICAgIGlm IG5vdCBjb21tb25fZmFpbHVyZXM6CisgICAgICAgICAgICAgICAgICAgICMgY3VycmVudF9idWls ZCBkb2Vzbid0IGhhdmUgYW55IGZhaWx1cmVzIGluIGNvbW1vbiB3aXRoCisgICAgICAgICAgICAg ICAgICAgICMgdGhlIHJlZCBidWlsZCB3ZSdyZSB3b3JyaWVkIGFib3V0LiAgV2UgYXNzdW1lIHRo YXQgYW55CisgICAgICAgICAgICAgICAgICAgICMgZmFpbHVyZXMgaW4gY3VycmVudF9idWlsZCB3 ZXJlIGR1ZSB0byBmbGFraW5lc3MuCisgICAgICAgICAgICAgICAgICAgIGJyZWFrCiAgICAgICAg ICAgICBsb29rX2JhY2tfY291bnQgKz0gMQotICAgICAgICByZXR1cm4gKGdyZWVuX2J1aWxkLCBy ZWRfYnVpbGQpCi0KLSAgICBkZWYgc3VzcGVjdF9yZXZpc2lvbnNfZm9yX2dyZWVuX3RvX3JlZF90 cmFuc2l0aW9uKHNlbGYsIHJlZF9idWlsZF9udW1iZXIsIGxvb2tfYmFja19saW1pdD0zMCwgYXZv aWRfZmxha2V5X3Rlc3RzPVRydWUpOgotICAgICAgICAobGFzdF9ncmVlbl9idWlsZCwgZmlyc3Rf cmVkX2J1aWxkKSA9IHNlbGYuZmluZF9ncmVlbl90b19yZWRfdHJhbnNpdGlvbihyZWRfYnVpbGRf bnVtYmVyLCBsb29rX2JhY2tfbGltaXQpCi0gICAgICAgIGlmIG5vdCBsYXN0X2dyZWVuX2J1aWxk OgorICAgICAgICAgICAgaWYgbG9va19iYWNrX2NvdW50ID4gbG9va19iYWNrX2xpbWl0OgorICAg ICAgICAgICAgICAgIHJldHVybiAoTm9uZSwgY3VycmVudF9idWlsZCkKKyAgICAgICAgICAgIGJ1 aWxkX2FmdGVyX2N1cnJlbnRfYnVpbGQgPSBjdXJyZW50X2J1aWxkCisgICAgICAgICAgICBjdXJy ZW50X2J1aWxkID0gY3VycmVudF9idWlsZC5wcmV2aW91c19idWlsZCgpCisgICAgICAgICMgV2Ug bXVzdCBpdGVyYXRlIGF0IGxlYXN0IG9uY2UgYmVjYXVzZSByZWRfYnVpbGQgaXMgcmVkLgorICAg ICAgICBhc3NlcnQoYnVpbGRfYWZ0ZXJfY3VycmVudF9idWlsZCkKKyAgICAgICAgIyBDdXJyZW50 IGJ1aWxkIG11c3QgZWl0aGVyIGJlIGdyZWVuIG9yIGhhdmUgbm8gZmFpbHVyZXMgaW4gY29tbW9u CisgICAgICAgICMgd2l0aCByZWQgYnVpbGQsIHNvIHdlJ3ZlIGZvdW5kIG91ciBmYWlsdXJlIHRy YW5zaXRpb24uCisgICAgICAgIHJldHVybiAoY3VycmVudF9idWlsZCwgYnVpbGRfYWZ0ZXJfY3Vy cmVudF9idWlsZCkKKworICAgIGRlZiBibGFtZXdvcnRoeV9yZXZpc2lvbnMoc2VsZiwgcmVkX2J1 aWxkX251bWJlciwgbG9va19iYWNrX2xpbWl0PTMwLCBhdm9pZF9mbGFrZXlfdGVzdHM9VHJ1ZSk6 CisgICAgICAgIHJlZF9idWlsZCA9IHNlbGYuYnVpbGQocmVkX2J1aWxkX251bWJlcikKKyAgICAg ICAgKGxhc3RfZ29vZF9idWlsZCwgZmlyc3RfYmFkX2J1aWxkKSA9IFwKKyAgICAgICAgICAgIHNl bGYuZmluZF9mYWlsdXJlX3RyYW5zaXRpb24ocmVkX2J1aWxkLCBsb29rX2JhY2tfbGltaXQpCisg ICAgICAgIGlmIG5vdCBsYXN0X2dvb2RfYnVpbGQ6CiAgICAgICAgICAgICByZXR1cm4gW10gIyBX ZSByYW4gb2ZmIHRoZSBsaW1pdCBvZiBvdXIgc2VhcmNoCi0gICAgICAgICMgaWYgYXZvaWRfZmxh a2V5X3Rlc3RzLCByZXF1aXJlIGF0IGxlYXN0IDIgcmVkIGJ1aWxkcyBiZWZvcmUgd2Ugc3VzcGVj dCBhIGdyZWVuIHRvIHJlZCB0cmFuc2l0aW9uLgotICAgICAgICBpZiBhdm9pZF9mbGFrZXlfdGVz dHMgYW5kIGZpcnN0X3JlZF9idWlsZCA9PSBzZWxmLmJ1aWxkKHJlZF9idWlsZF9udW1iZXIpOgor ICAgICAgICAjIElmIGF2b2lkX2ZsYWtleV90ZXN0cywgcmVxdWlyZSBhdCBsZWFzdCAyIGJhZCBi dWlsZHMgYmVmb3JlIHdlCisgICAgICAgICMgc3VzcGVjdCBhIHJlYWwgZmFpbHVyZSB0cmFuc2l0 aW9uLgorICAgICAgICBpZiBhdm9pZF9mbGFrZXlfdGVzdHMgYW5kIGZpcnN0X2JhZF9idWlsZCA9 PSByZWRfYnVpbGQ6CiAgICAgICAgICAgICByZXR1cm4gW10KLSAgICAgICAgc3VzcGVjdF9yZXZp c2lvbnMgPSByYW5nZShmaXJzdF9yZWRfYnVpbGQucmV2aXNpb24oKSwgbGFzdF9ncmVlbl9idWls ZC5yZXZpc2lvbigpLCAtMSkKKyAgICAgICAgc3VzcGVjdF9yZXZpc2lvbnMgPSByYW5nZShmaXJz dF9iYWRfYnVpbGQucmV2aXNpb24oKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBsYXN0X2dvb2RfYnVpbGQucmV2aXNpb24oKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAtMSkKICAgICAgICAgc3VzcGVjdF9yZXZpc2lvbnMucmV2ZXJzZSgpCiAgICAgICAg IHJldHVybiBzdXNwZWN0X3JldmlzaW9ucwogCiAKIGNsYXNzIExheW91dFRlc3RSZXN1bHRzKG9i amVjdCk6CisgICAgX2ZhaWx1cmVfa2V5ID0gIlRlc3RzIHdoZXJlIHJlc3VsdHMgZGlkIG5vdCBt YXRjaCBleHBlY3RlZCByZXN1bHRzOiIKKyAgICBfdGltZW91dF9rZXkgPSAiVGVzdHMgdGhhdCB0 aW1lZCBvdXQ6IgorCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVmIF9wYXJzZV9yZXN1bHRzX2h0 bWwoY2xzLCBwYWdlKToKICAgICAgICAgcGFyc2VkX3Jlc3VsdHMgPSB7fQpAQCAtMjA0LDYgKzIy OSwxMCBAQCBjbGFzcyBMYXlvdXRUZXN0UmVzdWx0cyhvYmplY3QpOgogICAgIGRlZiBwYXJzZWRf cmVzdWx0cyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX3BhcnNlZF9yZXN1bHRzCiAKKyAg ICBkZWYgZmFpbGVkX2FuZF90aW1lZF9vdXRfdGVzdHMoc2VsZik6CisgICAgICAgIHJldHVybiBz ZXQoc2VsZi5fcGFyc2VkX3Jlc3VsdHMuZ2V0KHNlbGYuX2ZhaWx1cmVfa2V5LCBbXSkgKworICAg ICAgICAgICAgICAgICAgIHNlbGYuX3BhcnNlZF9yZXN1bHRzLmdldChzZWxmLl90aW1lb3V0X2tl eSwgW10pKQorCiAKIGNsYXNzIEJ1aWxkKG9iamVjdCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYs IGJ1aWxkZXIsIGJ1aWxkX251bWJlciwgcmV2aXNpb24sIGlzX2dyZWVuKToKQEAgLTM5MSw3ICs0 MjAsNyBAQCBjbGFzcyBCdWlsZEJvdChvYmplY3QpOgogICAgICAgICAgICAgaWYgYnVpbGRlcl9z dGF0dXNbImlzX2dyZWVuIl06CiAgICAgICAgICAgICAgICAgY29udGludWUKICAgICAgICAgICAg IGJ1aWxkZXIgPSBzZWxmLmJ1aWxkZXJfd2l0aF9uYW1lKGJ1aWxkZXJfc3RhdHVzWyJuYW1lIl0p Ci0gICAgICAgICAgICByZXZpc2lvbnMgPSBidWlsZGVyLnN1c3BlY3RfcmV2aXNpb25zX2Zvcl9n cmVlbl90b19yZWRfdHJhbnNpdGlvbihidWlsZGVyX3N0YXR1c1siYnVpbGRfbnVtYmVyIl0pCisg ICAgICAgICAgICByZXZpc2lvbnMgPSBidWlsZGVyLmJsYW1ld29ydGh5X3JldmlzaW9ucyhidWls ZGVyX3N0YXR1c1siYnVpbGRfbnVtYmVyIl0pCiAgICAgICAgICAgICBmb3IgcmV2aXNpb24gaW4g cmV2aXNpb25zOgogICAgICAgICAgICAgICAgIGZhaWxpbmdfYm90cyA9IHJldmlzaW9uX3RvX2Zh aWxpbmdfYm90cy5nZXQocmV2aXNpb24sIFtdKQogICAgICAgICAgICAgICAgIGZhaWxpbmdfYm90 cy5hcHBlbmQoYnVpbGRlcikKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvY29tbW9uL25ldC9idWlsZGJvdF91bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdF91bml0dGVzdC5weQppbmRleCA4ZDkwNTA0Li4w YTBlOTQzIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9u ZXQvYnVpbGRib3RfdW5pdHRlc3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9jb21tb24vbmV0L2J1aWxkYm90X3VuaXR0ZXN0LnB5CkBAIC0zNCw0MiArMzQsNzMgQEAgZnJv bSB3ZWJraXRweS50aGlyZHBhcnR5LkJlYXV0aWZ1bFNvdXAgaW1wb3J0IEJlYXV0aWZ1bFNvdXAK IAogCiBjbGFzcyBCdWlsZGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0KLSAgICBkZWYgc2V0 VXAoc2VsZik6Ci0gICAgICAgIHNlbGYuYnVpbGRib3QgPSBCdWlsZEJvdCgpCi0gICAgICAgIHNl bGYuYnVpbGRlciA9IEJ1aWxkZXIoIlRlc3QgQnVpbGRlciIsIHNlbGYuYnVpbGRib3QpCisgICAg ZGVmIF9pbnN0YWxsX2ZldGNoX2J1aWxkKHNlbGYsIGZhaWx1cmUpOgogICAgICAgICBkZWYgX21v Y2tfZmV0Y2hfYnVpbGQoYnVpbGRfbnVtYmVyKToKLSAgICAgICAgICAgIHJldHVybiBCdWlsZCgK KyAgICAgICAgICAgIGJ1aWxkID0gQnVpbGQoCiAgICAgICAgICAgICAgICAgYnVpbGRlcj1zZWxm LmJ1aWxkZXIsCiAgICAgICAgICAgICAgICAgYnVpbGRfbnVtYmVyPWJ1aWxkX251bWJlciwKICAg ICAgICAgICAgICAgICByZXZpc2lvbj1idWlsZF9udW1iZXIgKyAxMDAwLAogICAgICAgICAgICAg ICAgIGlzX2dyZWVuPWJ1aWxkX251bWJlciA8IDQKICAgICAgICAgICAgICkKKyAgICAgICAgICAg IGJ1aWxkLl9sYXlvdXRfdGVzdF9yZXN1bHRzID0gTGF5b3V0VGVzdFJlc3VsdHMoCisgICAgICAg ICAgICAgICAgImh0dHA6Ly9idWlsZGJvdC5leGFtcGxlLmNvbS9mb28iLCB7CisgICAgICAgICAg ICAgICAgICAgIExheW91dFRlc3RSZXN1bHRzLl9mYWlsdXJlX2tleTogZmFpbHVyZShidWlsZF9u dW1iZXIpLAorICAgICAgICAgICAgICAgIH0pCisgICAgICAgICAgICByZXR1cm4gYnVpbGQKICAg ICAgICAgc2VsZi5idWlsZGVyLl9mZXRjaF9idWlsZCA9IF9tb2NrX2ZldGNoX2J1aWxkCiAKLSAg ICBkZWYgdGVzdF9maW5kX2dyZWVuX3RvX3JlZF90cmFuc2l0aW9uKHNlbGYpOgotICAgICAgICAo Z3JlZW5fYnVpbGQsIHJlZF9idWlsZCkgPSBzZWxmLmJ1aWxkZXIuZmluZF9ncmVlbl90b19yZWRf dHJhbnNpdGlvbigxMCkKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNlbGYuYnVpbGRi b3QgPSBCdWlsZEJvdCgpCisgICAgICAgIHNlbGYuYnVpbGRlciA9IEJ1aWxkZXIoIlRlc3QgQnVp bGRlciIsIHNlbGYuYnVpbGRib3QpCisgICAgICAgIHNlbGYuX2luc3RhbGxfZmV0Y2hfYnVpbGQo bGFtYmRhIGJ1aWxkX251bWJlcjogWyJ0ZXN0MSIsICJ0ZXN0MiJdKQorCisgICAgZGVmIHRlc3Rf ZmluZF9mYWlsdXJlX3RyYW5zaXRpb24oc2VsZik6CisgICAgICAgIChncmVlbl9idWlsZCwgcmVk X2J1aWxkKSA9IHNlbGYuYnVpbGRlci5maW5kX2ZhaWx1cmVfdHJhbnNpdGlvbihzZWxmLmJ1aWxk ZXIuYnVpbGQoMTApKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGdyZWVuX2J1aWxkLnJldmlz aW9uKCksIDEwMDMpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVkX2J1aWxkLnJldmlzaW9u KCksIDEwMDQpCiAKLSAgICAgICAgKGdyZWVuX2J1aWxkLCByZWRfYnVpbGQpID0gc2VsZi5idWls ZGVyLmZpbmRfZ3JlZW5fdG9fcmVkX3RyYW5zaXRpb24oMTAsIGxvb2tfYmFja19saW1pdD0yKQor ICAgICAgICAoZ3JlZW5fYnVpbGQsIHJlZF9idWlsZCkgPSBzZWxmLmJ1aWxkZXIuZmluZF9mYWls dXJlX3RyYW5zaXRpb24oc2VsZi5idWlsZGVyLmJ1aWxkKDEwKSwgbG9va19iYWNrX2xpbWl0PTIp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZ3JlZW5fYnVpbGQsIE5vbmUpCiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwocmVkX2J1aWxkLnJldmlzaW9uKCksIDEwMDgpCiAKICAgICBkZWYgdGVz dF9ub25lX2J1aWxkKHNlbGYpOgogICAgICAgICBzZWxmLmJ1aWxkZXIuX2ZldGNoX2J1aWxkID0g bGFtYmRhIGJ1aWxkX251bWJlcjogTm9uZQotICAgICAgICAoZ3JlZW5fYnVpbGQsIHJlZF9idWls ZCkgPSBzZWxmLmJ1aWxkZXIuZmluZF9ncmVlbl90b19yZWRfdHJhbnNpdGlvbigxMCkKKyAgICAg ICAgKGdyZWVuX2J1aWxkLCByZWRfYnVpbGQpID0gc2VsZi5idWlsZGVyLmZpbmRfZmFpbHVyZV90 cmFuc2l0aW9uKHNlbGYuYnVpbGRlci5idWlsZCgxMCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoZ3JlZW5fYnVpbGQsIE5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVkX2J1aWxk LCBOb25lKQogCi0gICAgZGVmIHRlc3Rfc3VzcGVjdF9yZXZpc2lvbnNfZm9yX2dyZWVuX3RvX3Jl ZF90cmFuc2l0aW9uKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuYnVpbGRl ci5zdXNwZWN0X3JldmlzaW9uc19mb3JfZ3JlZW5fdG9fcmVkX3RyYW5zaXRpb24oMTApLCBbMTAw NF0pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLnN1c3BlY3RfcmV2aXNp b25zX2Zvcl9ncmVlbl90b19yZWRfdHJhbnNpdGlvbigxMCwgbG9va19iYWNrX2xpbWl0PTIpLCBb XSkKKyAgICBkZWYgdGVzdF9mbGFreV90ZXN0cyhzZWxmKToKKyAgICAgICAgc2VsZi5faW5zdGFs bF9mZXRjaF9idWlsZChsYW1iZGEgYnVpbGRfbnVtYmVyOiBbInRlc3QxIl0gaWYgYnVpbGRfbnVt YmVyICUgMiBlbHNlIFsidGVzdDIiXSkKKyAgICAgICAgKGdyZWVuX2J1aWxkLCByZWRfYnVpbGQp ID0gc2VsZi5idWlsZGVyLmZpbmRfZmFpbHVyZV90cmFuc2l0aW9uKHNlbGYuYnVpbGRlci5idWls ZCgxMCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZ3JlZW5fYnVpbGQucmV2aXNpb24oKSwg MTAwOSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZWRfYnVpbGQucmV2aXNpb24oKSwgMTAx MCkKKworICAgIGRlZiB0ZXN0X2ZhaWx1cmVfYW5kX2ZsYWt5KHNlbGYpOgorICAgICAgICBzZWxm Ll9pbnN0YWxsX2ZldGNoX2J1aWxkKGxhbWJkYSBidWlsZF9udW1iZXI6IFsidGVzdDEiLCAidGVz dDIiXSBpZiBidWlsZF9udW1iZXIgJSAyIGVsc2UgWyJ0ZXN0MiJdKQorICAgICAgICAoZ3JlZW5f YnVpbGQsIHJlZF9idWlsZCkgPSBzZWxmLmJ1aWxkZXIuZmluZF9mYWlsdXJlX3RyYW5zaXRpb24o c2VsZi5idWlsZGVyLmJ1aWxkKDEwKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChncmVlbl9i dWlsZC5yZXZpc2lvbigpLCAxMDAzKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlZF9idWls ZC5yZXZpc2lvbigpLCAxMDA0KQorCisgICAgZGVmIHRlc3Rfbm9fcmVzdWx0cyhzZWxmKToKKyAg ICAgICAgc2VsZi5faW5zdGFsbF9mZXRjaF9idWlsZChsYW1iZGEgYnVpbGRfbnVtYmVyOiBbInRl c3QxIiwgInRlc3QyIl0gaWYgYnVpbGRfbnVtYmVyICUgMiBlbHNlIFsidGVzdDIiXSkKKyAgICAg ICAgKGdyZWVuX2J1aWxkLCByZWRfYnVpbGQpID0gc2VsZi5idWlsZGVyLmZpbmRfZmFpbHVyZV90 cmFuc2l0aW9uKHNlbGYuYnVpbGRlci5idWlsZCgxMCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoZ3JlZW5fYnVpbGQucmV2aXNpb24oKSwgMTAwMykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChyZWRfYnVpbGQucmV2aXNpb24oKSwgMTAwNCkKKworICAgIGRlZiB0ZXN0X2ZhaWx1cmVfYWZ0 ZXJfZmxha3koc2VsZik6CisgICAgICAgIHNlbGYuX2luc3RhbGxfZmV0Y2hfYnVpbGQobGFtYmRh IGJ1aWxkX251bWJlcjogWyJ0ZXN0MSIsICJ0ZXN0MiJdIGlmIGJ1aWxkX251bWJlciA+IDYgZWxz ZSBbInRlc3QzIl0pCisgICAgICAgIChncmVlbl9idWlsZCwgcmVkX2J1aWxkKSA9IHNlbGYuYnVp bGRlci5maW5kX2ZhaWx1cmVfdHJhbnNpdGlvbihzZWxmLmJ1aWxkZXIuYnVpbGQoMTApKQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGdyZWVuX2J1aWxkLnJldmlzaW9uKCksIDEwMDYpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVkX2J1aWxkLnJldmlzaW9uKCksIDEwMDcpCisKKyAgICBk ZWYgdGVzdF9ibGFtZXdvcnRoeV9yZXZpc2lvbnMoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoc2VsZi5idWlsZGVyLmJsYW1ld29ydGh5X3JldmlzaW9ucygxMCksIFsxMDA0XSkKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmJ1aWxkZXIuYmxhbWV3b3J0aHlfcmV2aXNpb25z KDEwLCBsb29rX2JhY2tfbGltaXQ9MiksIFtdKQogICAgICAgICAjIEZsYWtleSB0ZXN0IGF2b2lk YW5jZSByZXF1aXJlcyBhdCBsZWFzdCAyIHJlZCBidWlsZHM6Ci0gICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoc2VsZi5idWlsZGVyLnN1c3BlY3RfcmV2aXNpb25zX2Zvcl9ncmVlbl90b19yZWRfdHJh bnNpdGlvbig0KSwgW10pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLnN1 c3BlY3RfcmV2aXNpb25zX2Zvcl9ncmVlbl90b19yZWRfdHJhbnNpdGlvbig0LCBhdm9pZF9mbGFr ZXlfdGVzdHM9RmFsc2UpLCBbMTAwNF0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5i dWlsZGVyLmJsYW1ld29ydGh5X3JldmlzaW9ucyg0KSwgW10pCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoc2VsZi5idWlsZGVyLmJsYW1ld29ydGh5X3JldmlzaW9ucyg0LCBhdm9pZF9mbGFrZXlf dGVzdHM9RmFsc2UpLCBbMTAwNF0pCiAgICAgICAgICMgR3JlZW4gYnVpbGRlcjoKLSAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChzZWxmLmJ1aWxkZXIuc3VzcGVjdF9yZXZpc2lvbnNfZm9yX2dyZWVu X3RvX3JlZF90cmFuc2l0aW9uKDMpLCBbXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxm LmJ1aWxkZXIuYmxhbWV3b3J0aHlfcmV2aXNpb25zKDMpLCBbXSkKIAogICAgIGRlZiB0ZXN0X2J1 aWxkX2NhY2hpbmcoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVy LmJ1aWxkKDEwKSwgc2VsZi5idWlsZGVyLmJ1aWxkKDEwKSkKZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWVyaWVzLnB5IGIvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkKaW5kZXggNWM2ODc4 MC4uODdlNWM4MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL3F1ZXJpZXMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkKQEAgLTEzMCwxMSArMTMwLDEyIEBAIGNsYXNzIFdoYXRC cm9rZShBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CiAgICAgICAgIHByaW50ICIgIFJldmll d2VyOiAlcyIgJSAoY29tbWl0X2luZm8ucmV2aWV3ZXIoKSBvciBjb21taXRfaW5mby5yZXZpZXdl cl90ZXh0KCkpCiAgICAgICAgIHByaW50ICIgIENvbW1pdHRlcjogJXMiICUgY29tbWl0X2luZm8u Y29tbWl0dGVyKCkKIAotICAgICMgRklYTUU6IFRoaXMgaXMgc2xpZ2h0bHkgZGlmZmVyZW50IGZy b20gQnVpbGRlci5zdXNwZWN0X3JldmlzaW9uc19mb3JfZ3JlZW5fdG9fcmVkX3RyYW5zaXRpb24K KyAgICAjIEZJWE1FOiBUaGlzIGlzIHNsaWdodGx5IGRpZmZlcmVudCBmcm9tIEJ1aWxkZXIuYmxh bWV3b3J0aHlfcmV2aXNpb25zCiAgICAgIyBkdWUgdG8gbmVlZGluZyB0byBkZXRlY3QgdGhlICJo aXQgdGhlIGxpbWl0IiBjYXNlIGFuIHByaW50IGEgc3BlY2lhbCBtZXNzYWdlLgogICAgIGRlZiBf cHJpbnRfYmxhbWVfaW5mb3JtYXRpb25fZm9yX2J1aWxkZXIoc2VsZiwgYnVpbGRlcl9zdGF0dXMs IG5hbWVfd2lkdGgsIGF2b2lkX2ZsYWtleV90ZXN0cz1UcnVlKToKICAgICAgICAgYnVpbGRlciA9 IHNlbGYudG9vbC5idWlsZGJvdC5idWlsZGVyX3dpdGhfbmFtZShidWlsZGVyX3N0YXR1c1sibmFt ZSJdKQotICAgICAgICAobGFzdF9ncmVlbl9idWlsZCwgZmlyc3RfcmVkX2J1aWxkKSA9IGJ1aWxk ZXIuZmluZF9ncmVlbl90b19yZWRfdHJhbnNpdGlvbihidWlsZGVyX3N0YXR1c1siYnVpbGRfbnVt YmVyIl0pCisgICAgICAgIHJlZF9idWlsZCA9IGJ1aWxkZXIuYnVpbGQoYnVpbGRlcl9zdGF0dXNb ImJ1aWxkX251bWJlciJdKQorICAgICAgICAobGFzdF9ncmVlbl9idWlsZCwgZmlyc3RfcmVkX2J1 aWxkKSA9IGJ1aWxkZXIuZmluZF9mYWlsdXJlX3RyYW5zaXRpb24ocmVkX2J1aWxkKQogICAgICAg ICBpZiBub3QgZmlyc3RfcmVkX2J1aWxkOgogICAgICAgICAgICAgc2VsZi5fcHJpbnRfYnVpbGRl cl9saW5lKGJ1aWxkZXIubmFtZSgpLCBuYW1lX3dpZHRoLCAiRkFJTCAoZXJyb3IgbG9hZGluZyBi dWlsZCBpbmZvcm1hdGlvbikiKQogICAgICAgICAgICAgcmV0dXJuCg== 52518 2010-04-05 00:24:02 -0700 2010-04-05 14:00:52 -0700 Patch bug-37063-20100405002401.patch text/plain 13936 abarth ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3YmIyY2VlLi45MTk5NjIxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDQt MDUgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2Vk LgorCisgICAgICAgIFRpZ2h0ZW4gU2hlcmlmZkJvdCdzIGZsYWt5IHRlc3QgZGV0ZWN0b3IKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3MDYzCisKKyAg ICAgICAgSW5zdGVhZCBvZiBqdXN0IGxvb2tpbmcgZm9yIHR3byBzZXF1ZW50aWFsIHJlZCBidWls ZHMsIGxvb2sgZm9yIHR3bworICAgICAgICBzZXF1ZW50aWFsIGZhaWx1cmVzIG9mIHRoZSBzYW1l IHRlc3QuICBUaGlzIHNob3VsZCByZWR1Y2Ugc2hlcmlmZmJvdAorICAgICAgICBmYWxzZSBwb3Np dGl2ZSBzdWJzdGFudGlhbGx5LgorCisgICAgICAgIEknbSBsYW5kaW5nIHRoaXMgY2hhbmdlIHVu cmV2aWV3ZWQgYmVjYXVzZSBJJ3ZlIG5vdGljZWQgU2hlcmlmZkJvdAorICAgICAgICB0cmlnZ2Vy aW5nIGEgbG90IG1vcmUgZmFsc2UgcG9zaXRpdmVzIG5vdyB0aGF0IHdlJ3ZlIGV4cGFuZGVkIHRo ZSBzZXQKKyAgICAgICAgb2YgY29yZSBidWlsZGVycy4gIEkndmUgdHJpZWQgdG8gdGFrZSBFcmlj J3MgY29tbWVudHMgb24gQnVnIDM3MDYzIGludG8KKyAgICAgICAgYWNjb3VudC4gIEknbSBoYXBw eSB0byBpdGVyYXRlIG9uIHRoaXMgcGF0Y2ggdG9tb3Jyb3cgb25jZSBFcmljIHdha2VzCisgICAg ICAgIHVwLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90 LnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdF91bml0 dGVzdC5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmll cy5weToKKwogMjAxMC0wNC0wNCAgSm9obiBHcmVnZyAgPGpvaG5ueWdAZ29vZ2xlLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLCBhZGQgbXlzZWxmIHRvIHRoZSBjb21taXR0ZXJzIGxpc3QuCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRi b3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9uZXQvYnVpbGRib3Qu cHkKaW5kZXggMjc2MGQzMS4uNjI5YmRjMiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxkYm90LnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL25ldC9idWlsZGJvdC5weQpAQCAtMTM2LDQ0ICsxMzYsODIgQEAg Y2xhc3MgQnVpbGRlcihvYmplY3QpOgogICAgICAgICAgICAgKQogICAgICAgICByZXR1cm4gYnVp bGQKIAotICAgICMgRklYTUU6IFdlIHNob3VsZCBub3QgaGF2ZSB0byBwYXNzIGEgcmVkX2J1aWxk X251bWJlciwgYnV0IHJhdGhlciBCdWlsZGVyIHNob3VsZAotICAgICMga25vdyB3aGF0IGl0cyAi bGF0ZXN0X2J1aWxkIiBpcy4KLSAgICBkZWYgZmluZF9ncmVlbl90b19yZWRfdHJhbnNpdGlvbihz ZWxmLCByZWRfYnVpbGRfbnVtYmVyLCBsb29rX2JhY2tfbGltaXQ9MzApOgotICAgICAgICAjIHdh bGsgYmFja3dhcmRzIHVudGlsIHdlIGZpbmQgYSBncmVlbiBidWlsZAotICAgICAgICByZWRfYnVp bGQgPSBzZWxmLmJ1aWxkKHJlZF9idWlsZF9udW1iZXIpCi0gICAgICAgIGdyZWVuX2J1aWxkID0g Tm9uZQorICAgIGRlZiBmaW5kX2ZhaWx1cmVfdHJhbnNpdGlvbihzZWxmLCByZWRfYnVpbGQsIGxv b2tfYmFja19saW1pdD0zMCk6CisgICAgICAgIGlmIG5vdCByZWRfYnVpbGQgb3IgcmVkX2J1aWxk LmlzX2dyZWVuKCk6CisgICAgICAgICAgICByZXR1cm4gKE5vbmUsIE5vbmUpCisgICAgICAgIGNv bW1vbl9mYWlsdXJlcyA9IE5vbmUKKyAgICAgICAgY3VycmVudF9idWlsZCA9IHJlZF9idWlsZAor ICAgICAgICBidWlsZF9hZnRlcl9jdXJyZW50X2J1aWxkID0gTm9uZQogICAgICAgICBsb29rX2Jh Y2tfY291bnQgPSAwCi0gICAgICAgIHdoaWxlIHJlZF9idWlsZDoKLSAgICAgICAgICAgIGlmIGxv b2tfYmFja19jb3VudCA+PSBsb29rX2JhY2tfbGltaXQ6Ci0gICAgICAgICAgICAgICAgYnJlYWsK LSAgICAgICAgICAgICMgVXNlIGEgcHJldmlvdXNfYnVpbGQoKSBtZXRob2QgdG8gYXZvaWQgYXNz dW1pbmcgYnVpbGQgbnVtYmVycyBhcmUgc2VxdWVudGlhbC4KLSAgICAgICAgICAgIGJlZm9yZV9y ZWRfYnVpbGQgPSByZWRfYnVpbGQucHJldmlvdXNfYnVpbGQoKQotICAgICAgICAgICAgaWYgYmVm b3JlX3JlZF9idWlsZCBhbmQgYmVmb3JlX3JlZF9idWlsZC5pc19ncmVlbigpOgotICAgICAgICAg ICAgICAgIGdyZWVuX2J1aWxkID0gYmVmb3JlX3JlZF9idWlsZAorICAgICAgICB3aGlsZSBjdXJy ZW50X2J1aWxkOgorICAgICAgICAgICAgaWYgY3VycmVudF9idWlsZC5pc19ncmVlbigpOgorICAg ICAgICAgICAgICAgICMgY3VycmVudF9idWlsZCBjYW4ndCBwb3NzaWJseSBoYXZlIGFueSBmYWls dXJlcyBpbiBjb21tb24KKyAgICAgICAgICAgICAgICAjIHdpdGggcmVkX2J1aWxkIGJlY2F1c2Ug aXQncyBncmVlbi4KICAgICAgICAgICAgICAgICBicmVhawotICAgICAgICAgICAgcmVkX2J1aWxk ID0gYmVmb3JlX3JlZF9idWlsZAorICAgICAgICAgICAgcmVzdWx0cyA9IGN1cnJlbnRfYnVpbGQu bGF5b3V0X3Rlc3RfcmVzdWx0cygpCisgICAgICAgICAgICAjIFdlIHRyZWF0IGEgbGFjayBvZiBy ZXN1bHRzIGFzIGlmIGFsbCB0aGUgdGVzdCBmYWlsZWQuCisgICAgICAgICAgICAjIFRoaXMgb2Nj dXJzLCBmb3IgZXhhbXBsZSwgd2hlbiB3ZSBjYW4ndCBjb21waWxlIGF0IGFsbC4KKyAgICAgICAg ICAgIGlmIHJlc3VsdHM6CisgICAgICAgICAgICAgICAgZmFpbHVyZXMgPSBzZXQocmVzdWx0cy5m YWlsaW5nX3Rlc3RzKCkpCisgICAgICAgICAgICAgICAgaWYgY29tbW9uX2ZhaWx1cmVzID09IE5v bmU6CisgICAgICAgICAgICAgICAgICAgIGNvbW1vbl9mYWlsdXJlcyA9IGZhaWx1cmVzCisgICAg ICAgICAgICAgICAgY29tbW9uX2ZhaWx1cmVzID0gY29tbW9uX2ZhaWx1cmVzLmludGVyc2VjdGlv bihmYWlsdXJlcykKKyAgICAgICAgICAgICAgICBpZiBub3QgY29tbW9uX2ZhaWx1cmVzOgorICAg ICAgICAgICAgICAgICAgICAjIGN1cnJlbnRfYnVpbGQgZG9lc24ndCBoYXZlIGFueSBmYWlsdXJl cyBpbiBjb21tb24gd2l0aAorICAgICAgICAgICAgICAgICAgICAjIHRoZSByZWQgYnVpbGQgd2Un cmUgd29ycmllZCBhYm91dC4gIFdlIGFzc3VtZSB0aGF0IGFueQorICAgICAgICAgICAgICAgICAg ICAjIGZhaWx1cmVzIGluIGN1cnJlbnRfYnVpbGQgd2VyZSBkdWUgdG8gZmxha2luZXNzLgorICAg ICAgICAgICAgICAgICAgICBicmVhawogICAgICAgICAgICAgbG9va19iYWNrX2NvdW50ICs9IDEK LSAgICAgICAgcmV0dXJuIChncmVlbl9idWlsZCwgcmVkX2J1aWxkKQotCi0gICAgZGVmIHN1c3Bl Y3RfcmV2aXNpb25zX2Zvcl9ncmVlbl90b19yZWRfdHJhbnNpdGlvbihzZWxmLCByZWRfYnVpbGRf bnVtYmVyLCBsb29rX2JhY2tfbGltaXQ9MzAsIGF2b2lkX2ZsYWtleV90ZXN0cz1UcnVlKToKLSAg ICAgICAgKGxhc3RfZ3JlZW5fYnVpbGQsIGZpcnN0X3JlZF9idWlsZCkgPSBzZWxmLmZpbmRfZ3Jl ZW5fdG9fcmVkX3RyYW5zaXRpb24ocmVkX2J1aWxkX251bWJlciwgbG9va19iYWNrX2xpbWl0KQot ICAgICAgICBpZiBub3QgbGFzdF9ncmVlbl9idWlsZDoKKyAgICAgICAgICAgIGlmIGxvb2tfYmFj a19jb3VudCA+IGxvb2tfYmFja19saW1pdDoKKyAgICAgICAgICAgICAgICByZXR1cm4gKE5vbmUs IGN1cnJlbnRfYnVpbGQpCisgICAgICAgICAgICBidWlsZF9hZnRlcl9jdXJyZW50X2J1aWxkID0g Y3VycmVudF9idWlsZAorICAgICAgICAgICAgY3VycmVudF9idWlsZCA9IGN1cnJlbnRfYnVpbGQu cHJldmlvdXNfYnVpbGQoKQorICAgICAgICAjIFdlIG11c3QgaXRlcmF0ZSBhdCBsZWFzdCBvbmNl IGJlY2F1c2UgcmVkX2J1aWxkIGlzIHJlZC4KKyAgICAgICAgYXNzZXJ0KGJ1aWxkX2FmdGVyX2N1 cnJlbnRfYnVpbGQpCisgICAgICAgICMgQ3VycmVudCBidWlsZCBtdXN0IGVpdGhlciBiZSBncmVl biBvciBoYXZlIG5vIGZhaWx1cmVzIGluIGNvbW1vbgorICAgICAgICAjIHdpdGggcmVkIGJ1aWxk LCBzbyB3ZSd2ZSBmb3VuZCBvdXIgZmFpbHVyZSB0cmFuc2l0aW9uLgorICAgICAgICByZXR1cm4g KGN1cnJlbnRfYnVpbGQsIGJ1aWxkX2FmdGVyX2N1cnJlbnRfYnVpbGQpCisKKyAgICBkZWYgYmxh bWV3b3J0aHlfcmV2aXNpb25zKHNlbGYsIHJlZF9idWlsZF9udW1iZXIsIGxvb2tfYmFja19saW1p dD0zMCwgYXZvaWRfZmxha2V5X3Rlc3RzPVRydWUpOgorICAgICAgICByZWRfYnVpbGQgPSBzZWxm LmJ1aWxkKHJlZF9idWlsZF9udW1iZXIpCisgICAgICAgIChsYXN0X2dvb2RfYnVpbGQsIGZpcnN0 X2JhZF9idWlsZCkgPSBcCisgICAgICAgICAgICBzZWxmLmZpbmRfZmFpbHVyZV90cmFuc2l0aW9u KHJlZF9idWlsZCwgbG9va19iYWNrX2xpbWl0KQorICAgICAgICBpZiBub3QgbGFzdF9nb29kX2J1 aWxkOgogICAgICAgICAgICAgcmV0dXJuIFtdICMgV2UgcmFuIG9mZiB0aGUgbGltaXQgb2Ygb3Vy IHNlYXJjaAotICAgICAgICAjIGlmIGF2b2lkX2ZsYWtleV90ZXN0cywgcmVxdWlyZSBhdCBsZWFz dCAyIHJlZCBidWlsZHMgYmVmb3JlIHdlIHN1c3BlY3QgYSBncmVlbiB0byByZWQgdHJhbnNpdGlv bi4KLSAgICAgICAgaWYgYXZvaWRfZmxha2V5X3Rlc3RzIGFuZCBmaXJzdF9yZWRfYnVpbGQgPT0g c2VsZi5idWlsZChyZWRfYnVpbGRfbnVtYmVyKToKKyAgICAgICAgIyBJZiBhdm9pZF9mbGFrZXlf dGVzdHMsIHJlcXVpcmUgYXQgbGVhc3QgMiBiYWQgYnVpbGRzIGJlZm9yZSB3ZQorICAgICAgICAj IHN1c3BlY3QgYSByZWFsIGZhaWx1cmUgdHJhbnNpdGlvbi4KKyAgICAgICAgaWYgYXZvaWRfZmxh a2V5X3Rlc3RzIGFuZCBmaXJzdF9iYWRfYnVpbGQgPT0gcmVkX2J1aWxkOgogICAgICAgICAgICAg cmV0dXJuIFtdCi0gICAgICAgIHN1c3BlY3RfcmV2aXNpb25zID0gcmFuZ2UoZmlyc3RfcmVkX2J1 aWxkLnJldmlzaW9uKCksIGxhc3RfZ3JlZW5fYnVpbGQucmV2aXNpb24oKSwgLTEpCisgICAgICAg IHN1c3BlY3RfcmV2aXNpb25zID0gcmFuZ2UoZmlyc3RfYmFkX2J1aWxkLnJldmlzaW9uKCksCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFzdF9nb29kX2J1aWxkLnJldmlzaW9u KCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLTEpCiAgICAgICAgIHN1c3Bl Y3RfcmV2aXNpb25zLnJldmVyc2UoKQogICAgICAgICByZXR1cm4gc3VzcGVjdF9yZXZpc2lvbnMK IAogCiBjbGFzcyBMYXlvdXRUZXN0UmVzdWx0cyhvYmplY3QpOgorICAgIHN0ZGVycl9rZXkgPSB1 J1Rlc3RzIHRoYXQgaGFkIHN0ZGVyciBvdXRwdXQ6JworICAgIGZhaWxfa2V5ID0gdSdUZXN0cyB3 aGVyZSByZXN1bHRzIGRpZCBub3QgbWF0Y2ggZXhwZWN0ZWQgcmVzdWx0czonCisgICAgdGltZW91 dF9rZXkgPSB1J1Rlc3RzIHRoYXQgdGltZWQgb3V0OicKKyAgICBjcmFzaF9rZXkgPSB1J1Rlc3Rz IHRoYXQgY2F1c2VkIHRoZSBEdW1wUmVuZGVyVHJlZSB0b29sIHRvIGNyYXNoOicKKyAgICBtaXNz aW5nX2tleSA9IHUnVGVzdHMgdGhhdCBoYWQgbm8gZXhwZWN0ZWQgcmVzdWx0cyAocHJvYmFibHkg bmV3KTonCisKKyAgICBleHBlY3RlZF9rZXlzID0gWworICAgICAgICBzdGRlcnJfa2V5LAorICAg ICAgICBmYWlsX2tleSwKKyAgICAgICAgY3Jhc2hfa2V5LAorICAgICAgICB0aW1lb3V0X2tleSwK KyAgICAgICAgbWlzc2luZ19rZXksCisgICAgXQorCiAgICAgQGNsYXNzbWV0aG9kCiAgICAgZGVm IF9wYXJzZV9yZXN1bHRzX2h0bWwoY2xzLCBwYWdlKToKICAgICAgICAgcGFyc2VkX3Jlc3VsdHMg PSB7fQogICAgICAgICB0YWJsZXMgPSBCZWF1dGlmdWxTb3VwKHBhZ2UpLmZpbmRBbGwoInRhYmxl IikKICAgICAgICAgZm9yIHRhYmxlIGluIHRhYmxlczoKICAgICAgICAgICAgIHRhYmxlX3RpdGxl ID0gdGFibGUuZmluZFByZXZpb3VzU2libGluZygicCIpLnN0cmluZworICAgICAgICAgICAgaWYg dGFibGVfdGl0bGUgbm90IGluIGNscy5leHBlY3RlZF9rZXlzOgorICAgICAgICAgICAgICAgIHJh aXNlICJVbmhhbmRsZWQgdGl0bGU6ICVzIiAlIHN0cih0YWJsZV90aXRsZSkKICAgICAgICAgICAg ICMgV2UgbWlnaHQgd2FudCB0byB0cmFuc2xhdGUgdGFibGUgdGl0bGVzIGludG8gaWRlbnRpZmll cnMgYXQgc29tZSBwb2ludC4KICAgICAgICAgICAgIHBhcnNlZF9yZXN1bHRzW3RhYmxlX3RpdGxl XSA9IFtyb3cuZmluZCgiYSIpLnN0cmluZyBmb3Igcm93IGluIHRhYmxlLmZpbmRBbGwoInRyIild CiAKQEAgLTIwNCw2ICsyNDIsMTAgQEAgY2xhc3MgTGF5b3V0VGVzdFJlc3VsdHMob2JqZWN0KToK ICAgICBkZWYgcGFyc2VkX3Jlc3VsdHMoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLl9wYXJz ZWRfcmVzdWx0cwogCisgICAgZGVmIGZhaWxpbmdfdGVzdHMoc2VsZik6CisgICAgICAgIGZhaWxp bmdfa2V5cyA9IFtzZWxmLmZhaWxfa2V5LCBzZWxmLmNyYXNoX2tleSwgc2VsZi50aW1lb3V0X2tl eV0KKyAgICAgICAgcmV0dXJuIHNvcnRlZChzdW0oW3Rlc3RzIGZvciBrZXksIHRlc3RzIGluIHNl bGYuX3BhcnNlZF9yZXN1bHRzLml0ZW1zKCkgaWYga2V5IGluIGZhaWxpbmdfa2V5c10sIFtdKSkK KwogCiBjbGFzcyBCdWlsZChvYmplY3QpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBidWlsZGVy LCBidWlsZF9udW1iZXIsIHJldmlzaW9uLCBpc19ncmVlbik6CkBAIC0zOTEsNyArNDMzLDcgQEAg Y2xhc3MgQnVpbGRCb3Qob2JqZWN0KToKICAgICAgICAgICAgIGlmIGJ1aWxkZXJfc3RhdHVzWyJp c19ncmVlbiJdOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICBidWlsZGVy ID0gc2VsZi5idWlsZGVyX3dpdGhfbmFtZShidWlsZGVyX3N0YXR1c1sibmFtZSJdKQotICAgICAg ICAgICAgcmV2aXNpb25zID0gYnVpbGRlci5zdXNwZWN0X3JldmlzaW9uc19mb3JfZ3JlZW5fdG9f cmVkX3RyYW5zaXRpb24oYnVpbGRlcl9zdGF0dXNbImJ1aWxkX251bWJlciJdKQorICAgICAgICAg ICAgcmV2aXNpb25zID0gYnVpbGRlci5ibGFtZXdvcnRoeV9yZXZpc2lvbnMoYnVpbGRlcl9zdGF0 dXNbImJ1aWxkX251bWJlciJdKQogICAgICAgICAgICAgZm9yIHJldmlzaW9uIGluIHJldmlzaW9u czoKICAgICAgICAgICAgICAgICBmYWlsaW5nX2JvdHMgPSByZXZpc2lvbl90b19mYWlsaW5nX2Jv dHMuZ2V0KHJldmlzaW9uLCBbXSkKICAgICAgICAgICAgICAgICBmYWlsaW5nX2JvdHMuYXBwZW5k KGJ1aWxkZXIpCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9uZXQvYnVpbGRib3RfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9uZXQvYnVpbGRib3RfdW5pdHRlc3QucHkKaW5kZXggOGQ5MDUwNC4uYWExZjJhNSAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vbmV0L2J1aWxk Ym90X3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L25ldC9idWlsZGJvdF91bml0dGVzdC5weQpAQCAtMzQsNDIgKzM0LDczIEBAIGZyb20gd2Via2l0 cHkudGhpcmRwYXJ0eS5CZWF1dGlmdWxTb3VwIGltcG9ydCBCZWF1dGlmdWxTb3VwCiAKIAogY2xh c3MgQnVpbGRlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgotCi0gICAgZGVmIHNldFVwKHNlbGYp OgotICAgICAgICBzZWxmLmJ1aWxkYm90ID0gQnVpbGRCb3QoKQotICAgICAgICBzZWxmLmJ1aWxk ZXIgPSBCdWlsZGVyKCJUZXN0IEJ1aWxkZXIiLCBzZWxmLmJ1aWxkYm90KQorICAgIGRlZiBfaW5z dGFsbF9mZXRjaF9idWlsZChzZWxmLCBmYWlsdXJlKToKICAgICAgICAgZGVmIF9tb2NrX2ZldGNo X2J1aWxkKGJ1aWxkX251bWJlcik6Ci0gICAgICAgICAgICByZXR1cm4gQnVpbGQoCisgICAgICAg ICAgICBidWlsZCA9IEJ1aWxkKAogICAgICAgICAgICAgICAgIGJ1aWxkZXI9c2VsZi5idWlsZGVy LAogICAgICAgICAgICAgICAgIGJ1aWxkX251bWJlcj1idWlsZF9udW1iZXIsCiAgICAgICAgICAg ICAgICAgcmV2aXNpb249YnVpbGRfbnVtYmVyICsgMTAwMCwKICAgICAgICAgICAgICAgICBpc19n cmVlbj1idWlsZF9udW1iZXIgPCA0CiAgICAgICAgICAgICApCisgICAgICAgICAgICBidWlsZC5f bGF5b3V0X3Rlc3RfcmVzdWx0cyA9IExheW91dFRlc3RSZXN1bHRzKAorICAgICAgICAgICAgICAg ICJodHRwOi8vYnVpbGRib3QuZXhhbXBsZS5jb20vZm9vIiwgeworICAgICAgICAgICAgICAgICAg ICBMYXlvdXRUZXN0UmVzdWx0cy5mYWlsX2tleTogZmFpbHVyZShidWlsZF9udW1iZXIpLAorICAg ICAgICAgICAgICAgIH0pCisgICAgICAgICAgICByZXR1cm4gYnVpbGQKICAgICAgICAgc2VsZi5i dWlsZGVyLl9mZXRjaF9idWlsZCA9IF9tb2NrX2ZldGNoX2J1aWxkCiAKLSAgICBkZWYgdGVzdF9m aW5kX2dyZWVuX3RvX3JlZF90cmFuc2l0aW9uKHNlbGYpOgotICAgICAgICAoZ3JlZW5fYnVpbGQs IHJlZF9idWlsZCkgPSBzZWxmLmJ1aWxkZXIuZmluZF9ncmVlbl90b19yZWRfdHJhbnNpdGlvbigx MCkKKyAgICBkZWYgc2V0VXAoc2VsZik6CisgICAgICAgIHNlbGYuYnVpbGRib3QgPSBCdWlsZEJv dCgpCisgICAgICAgIHNlbGYuYnVpbGRlciA9IEJ1aWxkZXIoIlRlc3QgQnVpbGRlciIsIHNlbGYu YnVpbGRib3QpCisgICAgICAgIHNlbGYuX2luc3RhbGxfZmV0Y2hfYnVpbGQobGFtYmRhIGJ1aWxk X251bWJlcjogWyJ0ZXN0MSIsICJ0ZXN0MiJdKQorCisgICAgZGVmIHRlc3RfZmluZF9mYWlsdXJl X3RyYW5zaXRpb24oc2VsZik6CisgICAgICAgIChncmVlbl9idWlsZCwgcmVkX2J1aWxkKSA9IHNl bGYuYnVpbGRlci5maW5kX2ZhaWx1cmVfdHJhbnNpdGlvbihzZWxmLmJ1aWxkZXIuYnVpbGQoMTAp KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGdyZWVuX2J1aWxkLnJldmlzaW9uKCksIDEwMDMp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVkX2J1aWxkLnJldmlzaW9uKCksIDEwMDQpCiAK LSAgICAgICAgKGdyZWVuX2J1aWxkLCByZWRfYnVpbGQpID0gc2VsZi5idWlsZGVyLmZpbmRfZ3Jl ZW5fdG9fcmVkX3RyYW5zaXRpb24oMTAsIGxvb2tfYmFja19saW1pdD0yKQorICAgICAgICAoZ3Jl ZW5fYnVpbGQsIHJlZF9idWlsZCkgPSBzZWxmLmJ1aWxkZXIuZmluZF9mYWlsdXJlX3RyYW5zaXRp b24oc2VsZi5idWlsZGVyLmJ1aWxkKDEwKSwgbG9va19iYWNrX2xpbWl0PTIpCiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoZ3JlZW5fYnVpbGQsIE5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwocmVkX2J1aWxkLnJldmlzaW9uKCksIDEwMDgpCiAKICAgICBkZWYgdGVzdF9ub25lX2J1aWxk KHNlbGYpOgogICAgICAgICBzZWxmLmJ1aWxkZXIuX2ZldGNoX2J1aWxkID0gbGFtYmRhIGJ1aWxk X251bWJlcjogTm9uZQotICAgICAgICAoZ3JlZW5fYnVpbGQsIHJlZF9idWlsZCkgPSBzZWxmLmJ1 aWxkZXIuZmluZF9ncmVlbl90b19yZWRfdHJhbnNpdGlvbigxMCkKKyAgICAgICAgKGdyZWVuX2J1 aWxkLCByZWRfYnVpbGQpID0gc2VsZi5idWlsZGVyLmZpbmRfZmFpbHVyZV90cmFuc2l0aW9uKHNl bGYuYnVpbGRlci5idWlsZCgxMCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZ3JlZW5fYnVp bGQsIE5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVkX2J1aWxkLCBOb25lKQogCi0g ICAgZGVmIHRlc3Rfc3VzcGVjdF9yZXZpc2lvbnNfZm9yX2dyZWVuX3RvX3JlZF90cmFuc2l0aW9u KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuYnVpbGRlci5zdXNwZWN0X3Jl dmlzaW9uc19mb3JfZ3JlZW5fdG9fcmVkX3RyYW5zaXRpb24oMTApLCBbMTAwNF0pCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLnN1c3BlY3RfcmV2aXNpb25zX2Zvcl9ncmVl bl90b19yZWRfdHJhbnNpdGlvbigxMCwgbG9va19iYWNrX2xpbWl0PTIpLCBbXSkKKyAgICBkZWYg dGVzdF9mbGFreV90ZXN0cyhzZWxmKToKKyAgICAgICAgc2VsZi5faW5zdGFsbF9mZXRjaF9idWls ZChsYW1iZGEgYnVpbGRfbnVtYmVyOiBbInRlc3QxIl0gaWYgYnVpbGRfbnVtYmVyICUgMiBlbHNl IFsidGVzdDIiXSkKKyAgICAgICAgKGdyZWVuX2J1aWxkLCByZWRfYnVpbGQpID0gc2VsZi5idWls ZGVyLmZpbmRfZmFpbHVyZV90cmFuc2l0aW9uKHNlbGYuYnVpbGRlci5idWlsZCgxMCkpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoZ3JlZW5fYnVpbGQucmV2aXNpb24oKSwgMTAwOSkKKyAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChyZWRfYnVpbGQucmV2aXNpb24oKSwgMTAxMCkKKworICAgIGRl ZiB0ZXN0X2ZhaWx1cmVfYW5kX2ZsYWt5KHNlbGYpOgorICAgICAgICBzZWxmLl9pbnN0YWxsX2Zl dGNoX2J1aWxkKGxhbWJkYSBidWlsZF9udW1iZXI6IFsidGVzdDEiLCAidGVzdDIiXSBpZiBidWls ZF9udW1iZXIgJSAyIGVsc2UgWyJ0ZXN0MiJdKQorICAgICAgICAoZ3JlZW5fYnVpbGQsIHJlZF9i dWlsZCkgPSBzZWxmLmJ1aWxkZXIuZmluZF9mYWlsdXJlX3RyYW5zaXRpb24oc2VsZi5idWlsZGVy LmJ1aWxkKDEwKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChncmVlbl9idWlsZC5yZXZpc2lv bigpLCAxMDAzKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlZF9idWlsZC5yZXZpc2lvbigp LCAxMDA0KQorCisgICAgZGVmIHRlc3Rfbm9fcmVzdWx0cyhzZWxmKToKKyAgICAgICAgc2VsZi5f aW5zdGFsbF9mZXRjaF9idWlsZChsYW1iZGEgYnVpbGRfbnVtYmVyOiBbInRlc3QxIiwgInRlc3Qy Il0gaWYgYnVpbGRfbnVtYmVyICUgMiBlbHNlIFsidGVzdDIiXSkKKyAgICAgICAgKGdyZWVuX2J1 aWxkLCByZWRfYnVpbGQpID0gc2VsZi5idWlsZGVyLmZpbmRfZmFpbHVyZV90cmFuc2l0aW9uKHNl bGYuYnVpbGRlci5idWlsZCgxMCkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZ3JlZW5fYnVp bGQucmV2aXNpb24oKSwgMTAwMykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChyZWRfYnVpbGQu cmV2aXNpb24oKSwgMTAwNCkKKworICAgIGRlZiB0ZXN0X2ZhaWx1cmVfYWZ0ZXJfZmxha3koc2Vs Zik6CisgICAgICAgIHNlbGYuX2luc3RhbGxfZmV0Y2hfYnVpbGQobGFtYmRhIGJ1aWxkX251bWJl cjogWyJ0ZXN0MSIsICJ0ZXN0MiJdIGlmIGJ1aWxkX251bWJlciA+IDYgZWxzZSBbInRlc3QzIl0p CisgICAgICAgIChncmVlbl9idWlsZCwgcmVkX2J1aWxkKSA9IHNlbGYuYnVpbGRlci5maW5kX2Zh aWx1cmVfdHJhbnNpdGlvbihzZWxmLmJ1aWxkZXIuYnVpbGQoMTApKQorICAgICAgICBzZWxmLmFz c2VydEVxdWFsKGdyZWVuX2J1aWxkLnJldmlzaW9uKCksIDEwMDYpCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwocmVkX2J1aWxkLnJldmlzaW9uKCksIDEwMDcpCisKKyAgICBkZWYgdGVzdF9ibGFt ZXdvcnRoeV9yZXZpc2lvbnMoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5i dWlsZGVyLmJsYW1ld29ydGh5X3JldmlzaW9ucygxMCksIFsxMDA0XSkKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChzZWxmLmJ1aWxkZXIuYmxhbWV3b3J0aHlfcmV2aXNpb25zKDEwLCBsb29rX2Jh Y2tfbGltaXQ9MiksIFtdKQogICAgICAgICAjIEZsYWtleSB0ZXN0IGF2b2lkYW5jZSByZXF1aXJl cyBhdCBsZWFzdCAyIHJlZCBidWlsZHM6Ci0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5i dWlsZGVyLnN1c3BlY3RfcmV2aXNpb25zX2Zvcl9ncmVlbl90b19yZWRfdHJhbnNpdGlvbig0KSwg W10pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLnN1c3BlY3RfcmV2aXNp b25zX2Zvcl9ncmVlbl90b19yZWRfdHJhbnNpdGlvbig0LCBhdm9pZF9mbGFrZXlfdGVzdHM9RmFs c2UpLCBbMTAwNF0pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLmJsYW1l d29ydGh5X3JldmlzaW9ucyg0KSwgW10pCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5i dWlsZGVyLmJsYW1ld29ydGh5X3JldmlzaW9ucyg0LCBhdm9pZF9mbGFrZXlfdGVzdHM9RmFsc2Up LCBbMTAwNF0pCiAgICAgICAgICMgR3JlZW4gYnVpbGRlcjoKLSAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChzZWxmLmJ1aWxkZXIuc3VzcGVjdF9yZXZpc2lvbnNfZm9yX2dyZWVuX3RvX3JlZF90cmFu c2l0aW9uKDMpLCBbXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmJ1aWxkZXIuYmxh bWV3b3J0aHlfcmV2aXNpb25zKDMpLCBbXSkKIAogICAgIGRlZiB0ZXN0X2J1aWxkX2NhY2hpbmco c2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5idWlsZGVyLmJ1aWxkKDEwKSwg c2VsZi5idWlsZGVyLmJ1aWxkKDEwKSkKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWVyaWVzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkKaW5kZXggNWM2ODc4MC4uODdlNWM4MiAx MDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1 ZXJpZXMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRz L3F1ZXJpZXMucHkKQEAgLTEzMCwxMSArMTMwLDEyIEBAIGNsYXNzIFdoYXRCcm9rZShBYnN0cmFj dERlY2xhcmF0aXZlQ29tbWFuZCk6CiAgICAgICAgIHByaW50ICIgIFJldmlld2VyOiAlcyIgJSAo Y29tbWl0X2luZm8ucmV2aWV3ZXIoKSBvciBjb21taXRfaW5mby5yZXZpZXdlcl90ZXh0KCkpCiAg ICAgICAgIHByaW50ICIgIENvbW1pdHRlcjogJXMiICUgY29tbWl0X2luZm8uY29tbWl0dGVyKCkK IAotICAgICMgRklYTUU6IFRoaXMgaXMgc2xpZ2h0bHkgZGlmZmVyZW50IGZyb20gQnVpbGRlci5z dXNwZWN0X3JldmlzaW9uc19mb3JfZ3JlZW5fdG9fcmVkX3RyYW5zaXRpb24KKyAgICAjIEZJWE1F OiBUaGlzIGlzIHNsaWdodGx5IGRpZmZlcmVudCBmcm9tIEJ1aWxkZXIuYmxhbWV3b3J0aHlfcmV2 aXNpb25zCiAgICAgIyBkdWUgdG8gbmVlZGluZyB0byBkZXRlY3QgdGhlICJoaXQgdGhlIGxpbWl0 IiBjYXNlIGFuIHByaW50IGEgc3BlY2lhbCBtZXNzYWdlLgogICAgIGRlZiBfcHJpbnRfYmxhbWVf aW5mb3JtYXRpb25fZm9yX2J1aWxkZXIoc2VsZiwgYnVpbGRlcl9zdGF0dXMsIG5hbWVfd2lkdGgs IGF2b2lkX2ZsYWtleV90ZXN0cz1UcnVlKToKICAgICAgICAgYnVpbGRlciA9IHNlbGYudG9vbC5i dWlsZGJvdC5idWlsZGVyX3dpdGhfbmFtZShidWlsZGVyX3N0YXR1c1sibmFtZSJdKQotICAgICAg ICAobGFzdF9ncmVlbl9idWlsZCwgZmlyc3RfcmVkX2J1aWxkKSA9IGJ1aWxkZXIuZmluZF9ncmVl bl90b19yZWRfdHJhbnNpdGlvbihidWlsZGVyX3N0YXR1c1siYnVpbGRfbnVtYmVyIl0pCisgICAg ICAgIHJlZF9idWlsZCA9IGJ1aWxkZXIuYnVpbGQoYnVpbGRlcl9zdGF0dXNbImJ1aWxkX251bWJl ciJdKQorICAgICAgICAobGFzdF9ncmVlbl9idWlsZCwgZmlyc3RfcmVkX2J1aWxkKSA9IGJ1aWxk ZXIuZmluZF9mYWlsdXJlX3RyYW5zaXRpb24ocmVkX2J1aWxkKQogICAgICAgICBpZiBub3QgZmly c3RfcmVkX2J1aWxkOgogICAgICAgICAgICAgc2VsZi5fcHJpbnRfYnVpbGRlcl9saW5lKGJ1aWxk ZXIubmFtZSgpLCBuYW1lX3dpZHRoLCAiRkFJTCAoZXJyb3IgbG9hZGluZyBidWlsZCBpbmZvcm1h dGlvbikiKQogICAgICAgICAgICAgcmV0dXJuCg==