98648 2012-10-08 06:51:39 -0700 DumpRenderTree should have --pixel-tests option again 2012-11-06 02:15:23 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kbalazs kbalazs dpranke eric gyuyoung.kim rakuco webkit.review.bot oldest_to_newest 736670 0 kbalazs 2012-10-08 06:51:39 -0700 It turned out that it is useful to have a way to turn on pixel testing from the command line. See bug 95098 for example. I also often feel the luck of it when working with pixel tests. Let's add it back. 736678 1 167537 kbalazs 2012-10-08 07:07:25 -0700 Created attachment 167537 Patch 736680 2 167537 buildbot 2012-10-08 07:15:59 -0700 Comment on attachment 167537 Patch Attachment 167537 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/14201746 736710 3 167543 kbalazs 2012-10-08 09:02:32 -0700 Created attachment 167543 Patch 736838 4 eric 2012-10-08 11:33:47 -0700 Why is this useful? Pixel tests require a harness to parse them from the input stream and write out the png files, etc, no? 736894 5 dpranke 2012-10-08 11:58:37 -0700 (In reply to comment #4) > Why is this useful? Pixel tests require a harness to parse them from the input stream and write out the png files, etc, no? While that would seem to be true, I have heard the complaint from many people that they miss the flag. I guess maybe they extract the PNGs manually or something? 737532 6 kbalazs 2012-10-09 01:33:33 -0700 (In reply to comment #5) > (In reply to comment #4) > > Why is this useful? Pixel tests require a harness to parse them from the input stream and write out the png files, etc, no? > > While that would seem to be true, I have heard the complaint from many people that they miss the flag. I guess maybe they extract the PNGs manually or something? I often just check whether it is crashing or not or check if the output is an empty image (this is recognizable from the output). 749444 7 kbalazs 2012-10-24 00:54:12 -0700 Anyone up to review this? 750051 8 167543 dpranke 2012-10-24 14:35:36 -0700 Comment on attachment 167543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=167543&action=review Sorry, this must've fallen off my radar :(. > Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp:69 > +// We only support -v, -p, --pixel-tests, --stdout, --stderr and -, all the others will be -p doesn't actually work, does it? just --pixel-tests? Ideally we'd support -p everywhere as well. 759433 9 kbalazs 2012-11-06 02:14:50 -0800 (In reply to comment #8) > (From update of attachment 167543 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=167543&action=review > > Sorry, this must've fallen off my radar :(. > > > Tools/DumpRenderTree/qt/DumpRenderTreeMain.cpp:69 > > +// We only support -v, -p, --pixel-tests, --stdout, --stderr and -, all the others will be > > -p doesn't actually work, does it? just --pixel-tests? > > Ideally we'd support -p everywhere as well. Landed in http://trac.webkit.org/changeset/133574. I added -p to Qt's DRT and WTR, but I didn't do it for other ports. 167537 2012-10-08 07:07:25 -0700 2012-10-08 09:02:26 -0700 Patch bug-98648-20121008160618.patch text/plain 14767 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNjMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDcyMTZlMzVhMjRjMTVkNjkwMjgxOTU3YTY1N2NkOTI4 ZDZiNmQ5ZC4uMDE4MDIzZTQyM2M4MTIzZTQ5NjQxNjBhYjYxNzEwN2UyYmE5MDlkNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2 IEBACisyMDEyLTEwLTA4ICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKwor ICAgICAgICBEdW1wUmVuZGVyVHJlZSBzaG91bGQgaGF2ZSAtLXBpeGVsLXRlc3RzIG9wdGlvbiBh Z2FpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg2 NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YmFjayB0aGUgLS1waXhlbC10ZXN0cyBjb21tYW5kIGxpbmUgb3B0aW9uIHRvIER1bXBSZW5kZXJU cmVlLgorICAgICAgICBJdCB3YXMgcmVtb3ZlZCByMTI0NTgxIGJlY2F1c2UgdG9vbHMgZG9uJ3Qg dXNlIGl0IGFmdGVyIHRoYXQgcGF0Y2guCisgICAgICAgIEhvd2V2ZXIsIGl0IHR1cm5lZCBvdXQg dGhhdCBpdCBpcyB1c2VmdWwgZm9yIGRlYnVnZ2luZyBhbmQgd29ya2luZworICAgICAgICB3aXRo IHBpeGVsIHRlc3RzLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJU cmVlLmNwcDoKKyAgICAgICAgKHBhcnNlQ29tbWFuZExpbmVPcHRpb25zKToKKyAgICAgICAgKHJ1 blRlc3QpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHA6 CisgICAgICAgIChpbml0aWFsaXplR2xvYmFsc0Zyb21Db21tYW5kTGluZU9wdGlvbnMpOgorICAg ICAgICAocnVuVGVzdCk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJU cmVlLm1tOgorICAgICAgICAoaW5pdGlhbGl6ZUdsb2JhbHNGcm9tQ29tbWFuZExpbmVPcHRpb25z KToKKyAgICAgICAgKHJ1blRlc3QpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBS ZW5kZXJUcmVlTWFpbi5jcHA6CisgICAgICAgIChpc09wdGlvbik6CisgICAgICAgIChwcmludFVz YWdlKToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBS ZW5kZXJUcmVlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OnByb2Nl c3NMaW5lKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0Lmg6 CisgICAgICAgIChXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZTo6c2V0U2hvdWxkRHVtcFBpeGVsc0Zv ckFsbFRlc3RzKToKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlKToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAocnVuVGVzdCk6CisgICAg ICAgIChkbGxMYXVuY2hlckVudHJ5UG9pbnQpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3d4 L0R1bXBSZW5kZXJUcmVlV3guY3BwOgorICAgICAgICAocnVuVGVzdCk6CisgICAgICAgIChNeUFw cDo6T25Jbml0KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OlRlc3RDb250cm9sbGVyKToKKyAgICAg ICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV1RSOjpUZXN0 Q29udHJvbGxlcjo6cnVuVGVzdCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29u dHJvbGxlci5oOgorICAgICAgICAoVGVzdENvbnRyb2xsZXIpOgorCiAyMDEyLTEwLTAzICBCYWxh enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFRlc3QgZHJp dmVycyBzaG91bGQgaGFuZGxlIHJlcGFpbnQgcmVjdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9l ZmwvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IDY5YTQyMTFhMDA4YjZkMDNiY2JkNzYzMzc5NzM3 MTM1YWE4Y2MzMTguLmYzNjE3NmM2NGFjMjJkMWVlYzBhZTE4YTIxMGZjYTU1MDhlNWRmODcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZS5jcHAKKysr IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNjYsNiAr NjYsNyBAQCBSZWZQdHI8VGVzdFJ1bm5lcj4gZ1Rlc3RSdW5uZXI7CiB2b2xhdGlsZSBib29sIGRv bmUgPSBmYWxzZTsKIAogc3RhdGljIGJvb2wgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0Oworc3Rh dGljIGludCBkdW1wUGl4ZWxzRm9yQWxsVGVzdHMgPSBmYWxzZTsKIHN0YXRpYyBpbnQgZHVtcFRy ZWUgPSB0cnVlOwogc3RhdGljIGludCBwcmludFNlcGFyYXRvcnMgPSB0cnVlOwogCkBAIC0xOTIs NiArMTkzLDcgQEAgc3RhdGljIGJvb2wgcGFyc2VDb21tYW5kTGluZU9wdGlvbnMoaW50IGFyZ2Ms IGNoYXIqKiBhcmd2KQogewogICAgIHN0YXRpYyBjb25zdCBvcHRpb24gb3B0aW9uc1tdID0gewog ICAgICAgICB7Im5vdHJlZSIsIG5vX2FyZ3VtZW50LCAmZHVtcFRyZWUsIGZhbHNlfSwKKyAgICAg ICAgeyJwaXhlbC10ZXN0cyIsIG5vX2FyZ3VtZW50LCAmZHVtcFBpeGVsc0ZvckFsbFRlc3RzLCB0 cnVlfSwKICAgICAgICAgeyJ0cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgdHJ1ZX0sCiAg ICAgICAgIHswLCAwLCAwLCAwfQogICAgIH07CkBAIC0yNTgsNyArMjYwLDcgQEAgc3RhdGljIHZv aWQgcnVuVGVzdChjb25zdCBjaGFyKiBpbnB1dExpbmUpCiAgICAgVGVzdENvbW1hbmQgY29tbWFu ZCA9IHBhcnNlSW5wdXRMaW5lKGlucHV0TGluZSk7CiAgICAgY29uc3QgU3RyaW5nIHRlc3RQYXRo T3JVUkwoY29tbWFuZC5wYXRoT3JVUkwuY19zdHIoKSk7CiAgICAgQVNTRVJUKCF0ZXN0UGF0aE9y VVJMLmlzRW1wdHkoKSk7Ci0gICAgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0ID0gY29tbWFuZC5z aG91bGREdW1wUGl4ZWxzOworICAgIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCA9IGNvbW1hbmQu c2hvdWxkRHVtcFBpeGVscyB8fCBkdW1wUGl4ZWxzRm9yQWxsVGVzdHM7CiAgICAgY29uc3QgU3Ry aW5nIGV4cGVjdGVkUGl4ZWxIYXNoKGNvbW1hbmQuZXhwZWN0ZWRQaXhlbEhhc2guY19zdHIoKSk7 CiAKICAgICAvLyBDb252ZXJ0IHRoZSBwYXRoIGludG8gYSBmdWxsIGZpbGUgVVJMIGlmIGl0IGRv ZXMgbm90IGxvb2sKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVu ZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3Bw CmluZGV4IGY1NzRjMTFlOGU4YTQ2Y2E3NDZhM2E2NGJiZWQ2OTA4YjA0OGQ2NmYuLjMzMmFlZjhm MmUxMTFjMDQ2NzY4NWU4YTNhN2I2N2MwMzVmY2Q0MTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNzMsNiArNzMsNyBAQCBleHRlcm4gZ2NoYXIq IHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3Jlc3BvbnNlX21pbWVfdHlwZShXZWJLaXRXZWJGcmFtZSog ZnJhbWUpOwogCiB2b2xhdGlsZSBib29sIGRvbmU7CiBzdGF0aWMgYm9vbCBwcmludFNlcGFyYXRv cnM7CitzdGF0aWMgaW50IGR1bXBQaXhlbHNGb3JBbGxUZXN0cyA9IGZhbHNlOwogc3RhdGljIGJv b2wgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0Owogc3RhdGljIGludCBkdW1wVHJlZSA9IDE7CiBz dGF0aWMgaW50IHVzZVRpbWVvdXRXYXRjaGRvZyA9IDE7CkBAIC01NDgsNiArNTQ5LDcgQEAgc3Rh dGljIHZvaWQgaW5pdGlhbGl6ZUdsb2JhbHNGcm9tQ29tbWFuZExpbmVPcHRpb25zKGludCBhcmdj LCBjaGFyICphcmd2W10pCiB7CiAgICAgc3RydWN0IG9wdGlvbiBvcHRpb25zW10gPSB7CiAgICAg ICAgIHsibm90cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgZmFsc2V9LAorICAgICAgICB7 InBpeGVsLXRlc3RzIiwgbm9fYXJndW1lbnQsICZkdW1wUGl4ZWxzRm9yQWxsVGVzdHMsIHRydWV9 LAogICAgICAgICB7InRyZWUiLCBub19hcmd1bWVudCwgJmR1bXBUcmVlLCB0cnVlfSwKICAgICAg ICAgeyJuby10aW1lb3V0Iiwgbm9fYXJndW1lbnQsICZ1c2VUaW1lb3V0V2F0Y2hkb2csIGZhbHNl fSwKICAgICAgICAge05VTEwsIDAsIE5VTEwsIDB9CkBAIC02OTYsNyArNjk4LDcgQEAgc3RhdGlj IHZvaWQgcnVuVGVzdChjb25zdCBzdHJpbmcmIGlucHV0TGluZSkKIAogICAgIFRlc3RDb21tYW5k IGNvbW1hbmQgPSBwYXJzZUlucHV0TGluZShpbnB1dExpbmUpOwogICAgIHN0cmluZyYgdGVzdFVS TCA9IGNvbW1hbmQucGF0aE9yVVJMOwotICAgIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCA9IGNv bW1hbmQuc2hvdWxkRHVtcFBpeGVsczsKKyAgICBkdW1wUGl4ZWxzRm9yQ3VycmVudFRlc3QgPSBj b21tYW5kLnNob3VsZER1bXBQaXhlbHMgfHwgZHVtcFBpeGVsc0ZvckFsbFRlc3RzOwogCiAgICAg Ly8gQ29udmVydCB0aGUgcGF0aCBpbnRvIGEgZnVsbCBmaWxlIFVSTCBpZiBpdCBkb2VzIG5vdCBs b29rCiAgICAgLy8gbGlrZSBhbiBIVFRQL1MgVVJMIChkb2Vzbid0IHN0YXJ0IHdpdGggaHR0cDov LyBvciBodHRwczovLykuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVt cFJlbmRlclRyZWUubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUu bW0KaW5kZXggMWMwMWQ1MzgzZjFkNmJkMGNlZWQ4MjQyNjk1NmY5MDFhMTk3ZjZjNC4uMTEwYTVi NGE0NWQxNzBhNjZlNmE2NWEzMWJjMzFlY2NhNjRjOTk4ZiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtMTQ0LDYgKzE0NCw3IEBAIHN0YXRpYyBIaXN0 b3J5RGVsZWdhdGUgKmhpc3RvcnlEZWxlZ2F0ZTsKIFBvbGljeURlbGVnYXRlICpwb2xpY3lEZWxl Z2F0ZTsKIFN0b3JhZ2VUcmFja2VyRGVsZWdhdGUgKnN0b3JhZ2VEZWxlZ2F0ZTsKIAorc3RhdGlj IGludCBkdW1wUGl4ZWxzRm9yQWxsVGVzdHMgPSBOTzsKIHN0YXRpYyBib29sIGR1bXBQaXhlbHNG b3JDdXJyZW50VGVzdDsKIHN0YXRpYyBpbnQgdGhyZWFkZWQ7CiBzdGF0aWMgaW50IGR1bXBUcmVl ID0gWUVTOwpAQCAtNzg4LDYgKzc4OSw3IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVHbG9iYWxz RnJvbUNvbW1hbmRMaW5lT3B0aW9ucyhpbnQgYXJnYywgY29uc3QgY2hhciAqYXJndltdCiB7CiAg ICAgc3RydWN0IG9wdGlvbiBvcHRpb25zW10gPSB7CiAgICAgICAgIHsibm90cmVlIiwgbm9fYXJn dW1lbnQsICZkdW1wVHJlZSwgTk99LAorICAgICAgICB7InBpeGVsLXRlc3RzIiwgbm9fYXJndW1l bnQsICZkdW1wUGl4ZWxzRm9yQWxsVGVzdHMsIFlFU30KICAgICAgICAgeyJ0cmVlIiwgbm9fYXJn dW1lbnQsICZkdW1wVHJlZSwgWUVTfSwKICAgICAgICAgeyJ0aHJlYWRlZCIsIG5vX2FyZ3VtZW50 LCAmdGhyZWFkZWQsIFlFU30sCiAgICAgICAgIHsiY29tcGxleC10ZXh0Iiwgbm9fYXJndW1lbnQs ICZmb3JjZUNvbXBsZXhUZXh0LCBZRVN9LApAQCAtMTI5Myw3ICsxMjk1LDcgQEAgc3RhdGljIHZv aWQgcnVuVGVzdChjb25zdCBzdHJpbmcmIGlucHV0TGluZSkKIAogICAgIFRlc3RDb21tYW5kIGNv bW1hbmQgPSBwYXJzZUlucHV0TGluZShpbnB1dExpbmUpOwogICAgIGNvbnN0IHN0cmluZyYgcGF0 aE9yVVJMID0gY29tbWFuZC5wYXRoT3JVUkw7Ci0gICAgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0 ID0gY29tbWFuZC5zaG91bGREdW1wUGl4ZWxzOworICAgIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVz dCA9IGNvbW1hbmQuc2hvdWxkRHVtcFBpeGVscyB8fCBkdW1wUGl4ZWxzRm9yQWxsVGVzdHM7CiAK ICAgICBOU1N0cmluZyAqcGF0aE9yVVJMU3RyaW5nID0gW05TU3RyaW5nIHN0cmluZ1dpdGhVVEY4 U3RyaW5nOnBhdGhPclVSTC5jX3N0cigpXTsKICAgICBpZiAoIXBhdGhPclVSTFN0cmluZykgewpk aWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVNYWluLmNw cCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlTWFpbi5jcHAKaW5kZXgg MWJhYWU3Y2I4ZTFhNDYxMWEyNTdmOGJmYjc3Y2RiODQ1ZmE5NjBkYy4uMzkyMTk0MDEyZGQ0N2Ew NzY2YmI0YTVkZjllNjM5MmMzNTExODAxZSAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvcXQvRHVtcFJlbmRlclRyZWVNYWluLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9x dC9EdW1wUmVuZGVyVHJlZU1haW4uY3BwCkBAIC02NiwxMSArNjYsMTEgQEAgdm9pZCBtZXNzYWdl SGFuZGxlcihRdE1zZ1R5cGUgdHlwZSwgY29uc3QgUU1lc3NhZ2VMb2dDb250ZXh0JiwgY29uc3Qg UVN0cmluZyAmbWUKICAgICAvLyBkbyBub3RoaW5nCiB9CiAKLS8vIFdlIG9ubHkgc3VwcG9ydCAt diBvciAtLXN0ZG91dCBvciAtLXN0ZGVyciBvciAtLCBhbGwgdGhlIG90aGVycyB3aWxsIGJlCisv LyBXZSBvbmx5IHN1cHBvcnQgLXYsIC1wLCAtLXBpeGVsLXRlc3RzLCAtLXN0ZG91dCwgLS1zdGRl cnIgYW5kIC0sIGFsbCB0aGUgb3RoZXJzIHdpbGwgYmUKIC8vIHBhc3MgYXMgdGVzdCBjYXNlIG5h bWUgKGV2ZW4gLWFiYy5odG1sIGlzIGEgdmFsaWQgdGVzdCBjYXNlIG5hbWUpCiBib29sIGlzT3B0 aW9uKGNvbnN0IFFTdHJpbmcmIHN0cikKIHsKLSAgICByZXR1cm4gc3RyID09IFFTdHJpbmcoIi12 IikKKyAgICByZXR1cm4gc3RyID09IFFTdHJpbmcoIi12IikgfHwgc3RyID09IFFTdHJpbmcoIi0t cGl4ZWwtdGVzdHMiKQogICAgICAgICAgICB8fCBzdHIgPT0gUVN0cmluZygiLS1zdGRvdXQiKSB8 fCBzdHIgPT0gUVN0cmluZygiLS1zdGRlcnIiKQogICAgICAgICAgICB8fCBzdHIgPT0gUVN0cmlu ZygiLS10aW1lb3V0IikgfHwgc3RyID09IFFTdHJpbmcoIi0tbm8tdGltZW91dCIpCiAgICAgICAg ICAgIHx8IHN0ciA9PSBRU3RyaW5nKCItIik7CkBAIC04OSw4ICs4OSw4IEBAIFFTdHJpbmcgdGFr ZU9wdGlvblZhbHVlKFFTdHJpbmdMaXN0JiBhcmd1bWVudHMsIGludCBpbmRleCkKIAogdm9pZCBw cmludFVzYWdlKCkKIHsKLSAgICBmcHJpbnRmKHN0ZGVyciwgIlVzYWdlOiBEdW1wUmVuZGVyVHJl ZSBbLXZdIFstLXN0ZG91dCBvdXRwdXRfZmlsZW5hbWVdIFstc3RkZXJyIGVycm9yX2ZpbGVuYW1l XSBbLS1uby10aW1lb3V0XSBbLS10aW1lb3V0IHRpbWVvdXRfTVNdIGZpbGVuYW1lIFtmaWxlbmFt ZTIuLm5dXG4iKTsKLSAgICBmcHJpbnRmKHN0ZGVyciwgIk9yIGZvbGRlciBjb250YWluaW5nIHRl c3QgZmlsZXM6IER1bXBSZW5kZXJUcmVlIFstdl0gZGlycGF0aFxuIik7CisgICAgZnByaW50Zihz dGRlcnIsICJVc2FnZTogRHVtcFJlbmRlclRyZWUgWy12fC0tcGl4ZWwtdGVzdHNdIFstLXN0ZG91 dCBvdXRwdXRfZmlsZW5hbWVdIFstc3RkZXJyIGVycm9yX2ZpbGVuYW1lXSBbLS1uby10aW1lb3V0 XSBbLS10aW1lb3V0IHRpbWVvdXRfTVNdIGZpbGVuYW1lIFtmaWxlbmFtZTIuLm5dXG4iKTsKKyAg ICBmcHJpbnRmKHN0ZGVyciwgIk9yIGZvbGRlciBjb250YWluaW5nIHRlc3QgZmlsZXM6IER1bXBS ZW5kZXJUcmVlIFstdnwtLXBpeGVsLXRlc3RzXSBkaXJwYXRoXG4iKTsKICAgICBmZmx1c2goc3Rk ZXJyKTsKIH0KIApAQCAtMTU2LDYgKzE1NiwxMiBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciog YXJndltdKQogICAgICAgICAgICAgZXhpdCgxKTsKICAgICAgICAgfQogICAgIH0KKyAgICBpbmRl eCA9IGFyZ3MuaW5kZXhPZigiLS1waXhlbC10ZXN0cyIpOworICAgIGlmIChpbmRleCAhPSAtMSkg eworICAgICAgICBkdW1wZXIuc2V0U2hvdWxkRHVtcFBpeGVsc0ZvckFsbFRlc3RzKCk7CisgICAg ICAgIGFyZ3MucmVtb3ZlQXQoaW5kZXgpOworICAgIH0KKwogICAgIFFXZWJEYXRhYmFzZTo6cmVt b3ZlQWxsRGF0YWJhc2VzKCk7CiAKICAgICBpbmRleCA9IGFyZ3MuaW5kZXhPZihRTGF0aW4xU3Ry aW5nKCItLXRpbWVvdXQiKSk7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9E dW1wUmVuZGVyVHJlZVF0LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJU cmVlUXQuY3BwCmluZGV4IDBkMjhjYmNjMTE4N2Y1ZTE5OTQ5OTc5MDAwNGFkMzliZDc1NjlmYzAu LmNkNWU3YWEyMjc0NDBlZWI2YTg5Y2IxMDg5MjExZWY4ZDM0YTcxMWEgMTAwNzU1Ci0tLSBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCisrKyBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuY3BwCkBAIC0zODksNyArMzg5LDggQEAg V2ViVmlld0dyYXBoaWNzQmFzZWQ6OldlYlZpZXdHcmFwaGljc0Jhc2VkKFFXaWRnZXQqIHBhcmVu dCkKIH0KIAogRHVtcFJlbmRlclRyZWU6OkR1bXBSZW5kZXJUcmVlKCkKLSAgICA6IG1fc3RkaW4o MCkKKyAgICA6IG1fZHVtcFBpeGVsc0ZvckFsbFRlc3RzKGZhbHNlKQorICAgICwgbV9zdGRpbigw KQogICAgICwgbV9lbmFibGVUZXh0T3V0cHV0KGZhbHNlKQogICAgICwgbV9zdGFuZEFsb25lTW9k ZShmYWxzZSkKICAgICAsIG1fZ3JhcGhpY3NCYXNlZChmYWxzZSkKQEAgLTY5Miw3ICs2OTMsNyBA QCB2b2lkIER1bXBSZW5kZXJUcmVlOjpwcm9jZXNzTGluZShjb25zdCBRU3RyaW5nICZpbnB1dCkK IHsKICAgICBUZXN0Q29tbWFuZCBjb21tYW5kID0gcGFyc2VJbnB1dExpbmUoc3RkOjpzdHJpbmco aW5wdXQudG9MYXRpbjEoKS5jb25zdERhdGEoKSkpOwogICAgIFFTdHJpbmcgcGF0aE9yVVJMID0g UUxhdGluMVN0cmluZyhjb21tYW5kLnBhdGhPclVSTC5jX3N0cigpKTsKLSAgICBtX2R1bXBQaXhl bHNGb3JDdXJyZW50VGVzdCA9IGNvbW1hbmQuc2hvdWxkRHVtcFBpeGVsczsKKyAgICBtX2R1bXBQ aXhlbHNGb3JDdXJyZW50VGVzdCA9IGNvbW1hbmQuc2hvdWxkRHVtcFBpeGVscyB8fCBtX2R1bXBQ aXhlbHNGb3JBbGxUZXN0czsKICAgICBtX2V4cGVjdGVkSGFzaCA9IFFMYXRpbjFTdHJpbmcoY29t bWFuZC5leHBlY3RlZFBpeGVsSGFzaC5jX3N0cigpKTsKIAogICAgIGlmIChwYXRoT3JVUkwuc3Rh cnRzV2l0aChRTGF0aW4xU3RyaW5nKCJodHRwOiIpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQv RHVtcFJlbmRlclRyZWVRdC5oCmluZGV4IDcxMGYxNzM0Mzc4NGE3M2ExOTVmNTE3MjkyYzNkNmRi MGE1YmY4YjcuLjk4NDI5YzQ0ZWM5MzExMzIwMDdlNGQ4ZjNhYWNhZTRkYzlmOTY2NzggMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuaAorKysgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmgKQEAgLTEwNSw2ICsxMDUs NyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFRpbWVvdXQoaW50KTsKICAgICB2b2lkIHNldFNo b3VsZFRpbWVvdXQoYm9vbCBmbGFnKTsKKyAgICB2b2lkIHNldFNob3VsZER1bXBQaXhlbHNGb3JB bGxUZXN0cygpIHsgbV9kdW1wUGl4ZWxzRm9yQWxsVGVzdHMgPSB0cnVlOyB9CiAKIHB1YmxpYyBR X1NMT1RTOgogICAgIHZvaWQgaW5pdEpTT2JqZWN0cygpOwpAQCAtMTQxLDYgKzE0Miw3IEBAIHBy aXZhdGU6CiAgICAgVGVzdFJ1bm5lciAqbV9jb250cm9sbGVyOwogCiAgICAgYm9vbCBtX2R1bXBQ aXhlbHNGb3JDdXJyZW50VGVzdDsKKyAgICBib29sIG1fZHVtcFBpeGVsc0ZvckFsbFRlc3RzOwog ICAgIFFTdHJpbmcgbV9leHBlY3RlZEhhc2g7CiAgICAgUVN0cmluZ0xpc3QgbV9zdGFuZEFsb25l TW9kZVRlc3RMaXN0OwogCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVt cFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVl LmNwcAppbmRleCBhZDE3MjZkYzk1MmYyZTdhZjFlODFiZTc1MDdiODdkMDEyNTA1Mzk3Li4xNzNm MzQ1NzRmY2YzMjhhNDhjMmMwZGI1MDIzYTkyZmZjNWQxMjcwIDEwMDY0NAotLS0gYS9Ub29scy9E dW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTgwLDYgKzgwLDcgQEAgc3RhdGljIExQ Q1dTVFIgZm9udHNFbnZpcm9ubWVudFZhcmlhYmxlID0gTCJXRUJLSVRfVEVTVEZPTlRTIjsKIGNv bnN0IExQQ1dTVFIga0R1bXBSZW5kZXJUcmVlQ2xhc3NOYW1lID0gTCJEdW1wUmVuZGVyVHJlZVdp bmRvdyI7CiAKIHN0YXRpYyBib29sIGR1bXBUcmVlID0gdHJ1ZTsKK3N0YXRpYyBib29sIGR1bXBQ aXhlbHNGb3JBbGxUZXN0cyA9IGZhbHNlOwogc3RhdGljIGJvb2wgZHVtcFBpeGVsc0ZvckN1cnJl bnRUZXN0Owogc3RhdGljIGJvb2wgZHVtcEFsbFBpeGVsczsKIHN0YXRpYyBib29sIHByaW50U2Vw YXJhdG9yczsKQEAgLTk1Miw3ICs5NTMsNyBAQCBzdGF0aWMgdm9pZCBydW5UZXN0KGNvbnN0IHN0 cmluZyYgaW5wdXRMaW5lKQogewogICAgIFRlc3RDb21tYW5kIGNvbW1hbmQgPSBwYXJzZUlucHV0 TGluZShpbnB1dExpbmUpOwogICAgIGNvbnN0IHN0cmluZyYgcGF0aE9yVVJMID0gY29tbWFuZC5w YXRoT3JVUkw7Ci0gICAgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0ID0gY29tbWFuZC5zaG91bGRE dW1wUGl4ZWxzOworICAgIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCA9IGNvbW1hbmQuc2hvdWxk RHVtcFBpeGVscyB8fCBkdW1wUGl4ZWxzRm9yQWxsVGVzdHM7CiAKICAgICBzdGF0aWMgQlNUUiBt ZXRob2RCU3RyID0gU3lzQWxsb2NTdHJpbmcoVEVYVCgiR0VUIikpOwogCkBAIC0xMzQxLDYgKzEz NDIsMTEgQEAgZXh0ZXJuICJDIiBfX2RlY2xzcGVjKGRsbGV4cG9ydCkgaW50IFdJTkFQSSBkbGxM YXVuY2hlckVudHJ5UG9pbnQoaW50IGFyZ2MsIGNvbnMKICAgICAgICAgICAgIGNvbnRpbnVlOwog ICAgICAgICB9CiAKKyAgICAgICAgaWYgKCFzdHJpY21wKGFyZ3ZbaV0sICItLXBpeGVsLXRlc3Rz IikpIHsKKyAgICAgICAgICAgIGR1bXBQaXhlbHNGb3JBbGxUZXN0cyA9IHRydWU7CisgICAgICAg ICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCiAgICAgICAgIHRlc3RzLmFwcGVuZChhcmd2W2ld KTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0R1bXBSZW5k ZXJUcmVlV3guY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd3gvRHVtcFJlbmRlclRyZWVXeC5j cHAKaW5kZXggNTM4ZmYyNDlkMDQ5OGNmYjUwNzVlNzNiZjRiYmIwMTY2NmIwZjE5Yy4uY2FkZWNh ZjhmMDVmYzgxZDU5ZDcwZDUwYTY5N2U0OWEzMzk5OWE1MCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvd3gvRHVtcFJlbmRlclRyZWVXeC5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRl clRyZWUvd3gvRHVtcFJlbmRlclRyZWVXeC5jcHAKQEAgLTUwLDYgKzUwLDcgQEAKIHZvbGF0aWxl IGJvb2wgZG9uZSA9IHRydWU7CiB2b2xhdGlsZSBib29sIG5vdGlmaWVkID0gZmFsc2U7CiBzdGF0 aWMgYm9vbCBwcmludFNlcGFyYXRvcnMgPSB0cnVlOworc3RhdGljIGludCBkdW1wUGl4ZWxzRm9y QWxsVGVzdHMgPSBmYWxzZTsKIHN0YXRpYyBpbnQgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0Owog c3RhdGljIGludCBkdW1wVHJlZSA9IDE7CiB0aW1lX3Qgc3RhcnRUaW1lOyAvLyB0byBkZXRlY3Qg dGltZW91dHMgLyBmYWlsZWQgdGVzdHMKQEAgLTIyNSw3ICsyMjYsNyBAQCBzdGF0aWMgdm9pZCBy dW5UZXN0KGNvbnN0IHd4U3RyaW5nIGlucHV0TGluZSkKIAogICAgIFRlc3RDb21tYW5kIGNvbW1h bmQgPSBwYXJzZUlucHV0TGluZShzdGQ6OnN0cmluZyhpbnB1dExpbmUuVG9Bc2NpaSgpKSk7CiAg ICAgc3RyaW5nJiBwYXRoT3JVUkwgPSBjb21tYW5kLnBhdGhPclVSTDsKLSAgICBkdW1wUGl4ZWxz Rm9yQ3VycmVudFRlc3QgPSBjb21tYW5kLnNob3VsZER1bXBQaXhlbHM7CisgICAgZHVtcFBpeGVs c0ZvckN1cnJlbnRUZXN0ID0gY29tbWFuZC5zaG91bGREdW1wUGl4ZWxzIHx8IGR1bXBQaXhlbHNG b3JBbGxUZXN0czsKICAgICAKICAgICAvLyBDVVJMIGlzbid0IGhhcHB5IGlmIHdlIGRvbid0IGhh dmUgYSBwcm90b2NvbC4KICAgICBzaXplX3QgaHR0cCA9IHBhdGhPclVSTC5maW5kKCJodHRwOi8v Iik7CkBAIC0yODEsNiArMjgyLDExIEBAIGJvb2wgTXlBcHA6Ok9uSW5pdCgpCiAgICAgICAgICAg ICBkdW1wVHJlZSA9IHRydWU7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQorCisg ICAgICAgIGlmICghb3B0aW9uLkNtcE5vQ2FzZShfVCgiLS1waXhlbC10ZXN0cyIpKSkgeworICAg ICAgICAgICAgZHVtcFBpeGVsc0ZvckFsbFRlc3RzID0gdHJ1ZTsKKyAgICAgICAgICAgIGNvbnRp bnVlOworICAgICAgICB9CiAgICAgfQogICAgIHd4SW5pdEFsbEltYWdlSGFuZGxlcnMoKTsKICAg ICAgICAgCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVy LmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IDQy YjgxMmVhOGY0YzQxMzdiN2E2ZTU1MzVkMzhlZTUyYjVjYzNkODMuLjg0NzRkMjg1OTE0MzIyODE0 YTdmZjRkNzhjYzQ5ODRhMGY4MzkyMGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENv bnRyb2xsZXIuY3BwCkBAIC04MSw2ICs4MSw3IEBAIFRlc3RDb250cm9sbGVyOjpUZXN0Q29udHJv bGxlcihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogICAgICwgbV9wcmludFNlcGFyYXRv cnMoZmFsc2UpCiAgICAgLCBtX3VzaW5nU2VydmVyTW9kZShmYWxzZSkKICAgICAsIG1fZ2NCZXR3 ZWVuVGVzdHMoZmFsc2UpCisgICAgLCBtX3Nob3VsZER1bXBQaXhlbHNGb3JBbGxUZXN0cyhmYWxz ZSkKICAgICAsIG1fc3RhdGUoSW5pdGlhbCkKICAgICAsIG1fZG9uZVJlc2V0dGluZyhmYWxzZSkK ICAgICAsIG1fbG9uZ1RpbWVvdXQoZGVmYXVsdExvbmdUaW1lb3V0KQpAQCAtMjgxLDExICsyODIs MTYgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYywgY29uc3QgY2hh ciogYXJndltdKQogICAgICAgICAgICAgbV9nY0JldHdlZW5UZXN0cyA9IHRydWU7CiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgfQorICAgICAgICBpZiAoYXJndW1lbnQgPT0gIi0tcGl4 ZWwtdGVzdHMiKSB7CisgICAgICAgICAgICBtX3Nob3VsZER1bXBQaXhlbHNGb3JBbGxUZXN0cyA9 IHRydWU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQogICAgICAgICBpZiAoYXJn dW1lbnQgPT0gIi0tcHJpbnQtc3VwcG9ydGVkLWZlYXR1cmVzIikgewogICAgICAgICAgICAgcHJp bnRTdXBwb3J0ZWRGZWF0dXJlcyA9IHRydWU7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg fQogCisKICAgICAgICAgLy8gU2tpcCBhbnkgb3RoZXIgYXJndW1lbnRzIHRoYXQgYmVnaW4gd2l0 aCAnLS0nLgogICAgICAgICBpZiAoYXJndW1lbnQubGVuZ3RoKCkgPj0gMiAmJiBhcmd1bWVudFsw XSA9PSAnLScgJiYgYXJndW1lbnRbMV0gPT0gJy0nKQogICAgICAgICAgICAgY29udGludWU7CkBA IC02MTIsNyArNjE4LDcgQEAgYm9vbCBUZXN0Q29udHJvbGxlcjo6cnVuVGVzdChjb25zdCBjaGFy KiBpbnB1dExpbmUpCiAgICAgbV9zdGF0ZSA9IFJ1bm5pbmdUZXN0OwogCiAgICAgbV9jdXJyZW50 SW52b2NhdGlvbiA9IGFkb3B0UHRyKG5ldyBUZXN0SW52b2NhdGlvbihjb21tYW5kLnBhdGhPclVS TCkpOwotICAgIGlmIChjb21tYW5kLnNob3VsZER1bXBQaXhlbHMpCisgICAgaWYgKGNvbW1hbmQu c2hvdWxkRHVtcFBpeGVscyB8fCBtX3Nob3VsZER1bXBQaXhlbHNGb3JBbGxUZXN0cykKICAgICAg ICAgbV9jdXJyZW50SW52b2NhdGlvbi0+c2V0SXNQaXhlbFRlc3QoY29tbWFuZC5leHBlY3RlZFBp eGVsSGFzaCk7CiAKICAgICBtX2N1cnJlbnRJbnZvY2F0aW9uLT5pbnZva2UoKTsKZGlmZiAtLWdp dCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaCBiL1Rvb2xzL1dlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAppbmRleCBkNzExMWM1ZDM3ZjNiZDlmZTQwNTdi MTIzYWEyZDBkZTQxMGViMzJkLi5kNjU3MTE5MWMyYmVhMmViNzYwZWI1NmQzMGUxMDYxYzNkOTc3 M2Y0IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgK KysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCkBAIC0xMjQsNiAr MTI0LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1fcHJpbnRTZXBhcmF0b3JzOwogICAgIGJvb2wg bV91c2luZ1NlcnZlck1vZGU7CiAgICAgYm9vbCBtX2djQmV0d2VlblRlc3RzOworICAgIGJvb2wg bV9zaG91bGREdW1wUGl4ZWxzRm9yQWxsVGVzdHM7CiAgICAgc3RkOjp2ZWN0b3I8c3RkOjpzdHJp bmc+IG1fcGF0aHM7CiAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IG1faW5qZWN0ZWRCdW5k bGVQYXRoOwogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBtX3Rlc3RQbHVnaW5EaXJlY3Rv cnk7Cg== 167543 2012-10-08 09:02:32 -0700 2012-11-06 02:15:08 -0800 Patch bug-98648-20121008180125.patch text/plain 14768 kbalazs U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwNjMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNDcyMTZlMzVhMjRjMTVkNjkwMjgxOTU3YTY1N2NkOTI4 ZDZiNmQ5ZC4uMDE4MDIzZTQyM2M4MTIzZTQ5NjQxNjBhYjYxNzEwN2UyYmE5MDlkNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ2 IEBACisyMDEyLTEwLTA4ICBCYWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KKwor ICAgICAgICBEdW1wUmVuZGVyVHJlZSBzaG91bGQgaGF2ZSAtLXBpeGVsLXRlc3RzIG9wdGlvbiBh Z2FpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTg2 NDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg YmFjayB0aGUgLS1waXhlbC10ZXN0cyBjb21tYW5kIGxpbmUgb3B0aW9uIHRvIER1bXBSZW5kZXJU cmVlLgorICAgICAgICBJdCB3YXMgcmVtb3ZlZCByMTI0NTgxIGJlY2F1c2UgdG9vbHMgZG9uJ3Qg dXNlIGl0IGFmdGVyIHRoYXQgcGF0Y2guCisgICAgICAgIEhvd2V2ZXIsIGl0IHR1cm5lZCBvdXQg dGhhdCBpdCBpcyB1c2VmdWwgZm9yIGRlYnVnZ2luZyBhbmQgd29ya2luZworICAgICAgICB3aXRo IHBpeGVsIHRlc3RzLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJU cmVlLmNwcDoKKyAgICAgICAgKHBhcnNlQ29tbWFuZExpbmVPcHRpb25zKToKKyAgICAgICAgKHJ1 blRlc3QpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHA6 CisgICAgICAgIChpbml0aWFsaXplR2xvYmFsc0Zyb21Db21tYW5kTGluZU9wdGlvbnMpOgorICAg ICAgICAocnVuVGVzdCk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJU cmVlLm1tOgorICAgICAgICAoaW5pdGlhbGl6ZUdsb2JhbHNGcm9tQ29tbWFuZExpbmVPcHRpb25z KToKKyAgICAgICAgKHJ1blRlc3QpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBS ZW5kZXJUcmVlTWFpbi5jcHA6CisgICAgICAgIChpc09wdGlvbik6CisgICAgICAgIChwcmludFVz YWdlKToKKyAgICAgICAgKG1haW4pOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3F0L0R1bXBS ZW5kZXJUcmVlUXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RHVtcFJlbmRlclRyZWU6OnByb2Nl c3NMaW5lKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0Lmg6 CisgICAgICAgIChXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZTo6c2V0U2hvdWxkRHVtcFBpeGVsc0Zv ckFsbFRlc3RzKToKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlKToKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwOgorICAgICAgICAocnVuVGVzdCk6CisgICAg ICAgIChkbGxMYXVuY2hlckVudHJ5UG9pbnQpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL3d4 L0R1bXBSZW5kZXJUcmVlV3guY3BwOgorICAgICAgICAocnVuVGVzdCk6CisgICAgICAgIChNeUFw cDo6T25Jbml0KToKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OlRlc3RDb250cm9sbGVyKToKKyAgICAg ICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUpOgorICAgICAgICAoV1RSOjpUZXN0 Q29udHJvbGxlcjo6cnVuVGVzdCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29u dHJvbGxlci5oOgorICAgICAgICAoVGVzdENvbnRyb2xsZXIpOgorCiAyMDEyLTEwLTAzICBCYWxh enMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFRlc3QgZHJp dmVycyBzaG91bGQgaGFuZGxlIHJlcGFpbnQgcmVjdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9l ZmwvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IDY5YTQyMTFhMDA4YjZkMDNiY2JkNzYzMzc5NzM3 MTM1YWE4Y2MzMTguLmYzNjE3NmM2NGFjMjJkMWVlYzBhZTE4YTIxMGZjYTU1MDhlNWRmODcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2VmbC9EdW1wUmVuZGVyVHJlZS5jcHAKKysr IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZWZsL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNjYsNiAr NjYsNyBAQCBSZWZQdHI8VGVzdFJ1bm5lcj4gZ1Rlc3RSdW5uZXI7CiB2b2xhdGlsZSBib29sIGRv bmUgPSBmYWxzZTsKIAogc3RhdGljIGJvb2wgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0Oworc3Rh dGljIGludCBkdW1wUGl4ZWxzRm9yQWxsVGVzdHMgPSBmYWxzZTsKIHN0YXRpYyBpbnQgZHVtcFRy ZWUgPSB0cnVlOwogc3RhdGljIGludCBwcmludFNlcGFyYXRvcnMgPSB0cnVlOwogCkBAIC0xOTIs NiArMTkzLDcgQEAgc3RhdGljIGJvb2wgcGFyc2VDb21tYW5kTGluZU9wdGlvbnMoaW50IGFyZ2Ms IGNoYXIqKiBhcmd2KQogewogICAgIHN0YXRpYyBjb25zdCBvcHRpb24gb3B0aW9uc1tdID0gewog ICAgICAgICB7Im5vdHJlZSIsIG5vX2FyZ3VtZW50LCAmZHVtcFRyZWUsIGZhbHNlfSwKKyAgICAg ICAgeyJwaXhlbC10ZXN0cyIsIG5vX2FyZ3VtZW50LCAmZHVtcFBpeGVsc0ZvckFsbFRlc3RzLCB0 cnVlfSwKICAgICAgICAgeyJ0cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgdHJ1ZX0sCiAg ICAgICAgIHswLCAwLCAwLCAwfQogICAgIH07CkBAIC0yNTgsNyArMjYwLDcgQEAgc3RhdGljIHZv aWQgcnVuVGVzdChjb25zdCBjaGFyKiBpbnB1dExpbmUpCiAgICAgVGVzdENvbW1hbmQgY29tbWFu ZCA9IHBhcnNlSW5wdXRMaW5lKGlucHV0TGluZSk7CiAgICAgY29uc3QgU3RyaW5nIHRlc3RQYXRo T3JVUkwoY29tbWFuZC5wYXRoT3JVUkwuY19zdHIoKSk7CiAgICAgQVNTRVJUKCF0ZXN0UGF0aE9y VVJMLmlzRW1wdHkoKSk7Ci0gICAgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0ID0gY29tbWFuZC5z aG91bGREdW1wUGl4ZWxzOworICAgIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCA9IGNvbW1hbmQu c2hvdWxkRHVtcFBpeGVscyB8fCBkdW1wUGl4ZWxzRm9yQWxsVGVzdHM7CiAgICAgY29uc3QgU3Ry aW5nIGV4cGVjdGVkUGl4ZWxIYXNoKGNvbW1hbmQuZXhwZWN0ZWRQaXhlbEhhc2guY19zdHIoKSk7 CiAKICAgICAvLyBDb252ZXJ0IHRoZSBwYXRoIGludG8gYSBmdWxsIGZpbGUgVVJMIGlmIGl0IGRv ZXMgbm90IGxvb2sKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVu ZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3Bw CmluZGV4IGY1NzRjMTFlOGU4YTQ2Y2E3NDZhM2E2NGJiZWQ2OTA4YjA0OGQ2NmYuLjMzMmFlZjhm MmUxMTFjMDQ2NzY4NWU4YTNhN2I2N2MwMzVmY2Q0MTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRy ZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNzMsNiArNzMsNyBAQCBleHRlcm4gZ2NoYXIq IHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3Jlc3BvbnNlX21pbWVfdHlwZShXZWJLaXRXZWJGcmFtZSog ZnJhbWUpOwogCiB2b2xhdGlsZSBib29sIGRvbmU7CiBzdGF0aWMgYm9vbCBwcmludFNlcGFyYXRv cnM7CitzdGF0aWMgaW50IGR1bXBQaXhlbHNGb3JBbGxUZXN0cyA9IGZhbHNlOwogc3RhdGljIGJv b2wgZHVtcFBpeGVsc0ZvckN1cnJlbnRUZXN0Owogc3RhdGljIGludCBkdW1wVHJlZSA9IDE7CiBz dGF0aWMgaW50IHVzZVRpbWVvdXRXYXRjaGRvZyA9IDE7CkBAIC01NDgsNiArNTQ5LDcgQEAgc3Rh dGljIHZvaWQgaW5pdGlhbGl6ZUdsb2JhbHNGcm9tQ29tbWFuZExpbmVPcHRpb25zKGludCBhcmdj LCBjaGFyICphcmd2W10pCiB7CiAgICAgc3RydWN0IG9wdGlvbiBvcHRpb25zW10gPSB7CiAgICAg ICAgIHsibm90cmVlIiwgbm9fYXJndW1lbnQsICZkdW1wVHJlZSwgZmFsc2V9LAorICAgICAgICB7 InBpeGVsLXRlc3RzIiwgbm9fYXJndW1lbnQsICZkdW1wUGl4ZWxzRm9yQWxsVGVzdHMsIHRydWV9 LAogICAgICAgICB7InRyZWUiLCBub19hcmd1bWVudCwgJmR1bXBUcmVlLCB0cnVlfSwKICAgICAg ICAgeyJuby10aW1lb3V0Iiwgbm9fYXJndW1lbnQsICZ1c2VUaW1lb3V0V2F0Y2hkb2csIGZhbHNl fSwKICAgICAgICAge05VTEwsIDAsIE5VTEwsIDB9CkBAIC02OTYsNyArNjk4LDcgQEAgc3RhdGlj IHZvaWQgcnVuVGVzdChjb25zdCBzdHJpbmcmIGlucHV0TGluZSkKIAogICAgIFRlc3RDb21tYW5k IGNvbW1hbmQgPSBwYXJzZUlucHV0TGluZShpbnB1dExpbmUpOwogICAgIHN0cmluZyYgdGVzdFVS TCA9IGNvbW1hbmQucGF0aE9yVVJMOwotICAgIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCA9IGNv bW1hbmQuc2hvdWxkRHVtcFBpeGVsczsKKyAgICBkdW1wUGl4ZWxzRm9yQ3VycmVudFRlc3QgPSBj b21tYW5kLnNob3VsZER1bXBQaXhlbHMgfHwgZHVtcFBpeGVsc0ZvckFsbFRlc3RzOwogCiAgICAg Ly8gQ29udmVydCB0aGUgcGF0aCBpbnRvIGEgZnVsbCBmaWxlIFVSTCBpZiBpdCBkb2VzIG5vdCBs b29rCiAgICAgLy8gbGlrZSBhbiBIVFRQL1MgVVJMIChkb2Vzbid0IHN0YXJ0IHdpdGggaHR0cDov LyBvciBodHRwczovLykuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVt cFJlbmRlclRyZWUubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUu bW0KaW5kZXggMWMwMWQ1MzgzZjFkNmJkMGNlZWQ4MjQyNjk1NmY5MDFhMTk3ZjZjNC4uZjA3YTAx YWRmZjM2YTk0MDE4YzAzYzU5MDZmZGRiNTA4NTc1MzJhNCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQpAQCAtMTQ0LDYgKzE0NCw3IEBAIHN0YXRpYyBIaXN0 b3J5RGVsZWdhdGUgKmhpc3RvcnlEZWxlZ2F0ZTsKIFBvbGljeURlbGVnYXRlICpwb2xpY3lEZWxl Z2F0ZTsKIFN0b3JhZ2VUcmFja2VyRGVsZWdhdGUgKnN0b3JhZ2VEZWxlZ2F0ZTsKIAorc3RhdGlj IGludCBkdW1wUGl4ZWxzRm9yQWxsVGVzdHMgPSBOTzsKIHN0YXRpYyBib29sIGR1bXBQaXhlbHNG b3JDdXJyZW50VGVzdDsKIHN0YXRpYyBpbnQgdGhyZWFkZWQ7CiBzdGF0aWMgaW50IGR1bXBUcmVl ID0gWUVTOwpAQCAtNzg4LDYgKzc4OSw3IEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVHbG9iYWxz RnJvbUNvbW1hbmRMaW5lT3B0aW9ucyhpbnQgYXJnYywgY29uc3QgY2hhciAqYXJndltdCiB7CiAg ICAgc3RydWN0IG9wdGlvbiBvcHRpb25zW10gPSB7CiAgICAgICAgIHsibm90cmVlIiwgbm9fYXJn dW1lbnQsICZkdW1wVHJlZSwgTk99LAorICAgICAgICB7InBpeGVsLXRlc3RzIiwgbm9fYXJndW1l bnQsICZkdW1wUGl4ZWxzRm9yQWxsVGVzdHMsIFlFU30sCiAgICAgICAgIHsidHJlZSIsIG5vX2Fy Z3VtZW50LCAmZHVtcFRyZWUsIFlFU30sCiAgICAgICAgIHsidGhyZWFkZWQiLCBub19hcmd1bWVu dCwgJnRocmVhZGVkLCBZRVN9LAogICAgICAgICB7ImNvbXBsZXgtdGV4dCIsIG5vX2FyZ3VtZW50 LCAmZm9yY2VDb21wbGV4VGV4dCwgWUVTfSwKQEAgLTEyOTMsNyArMTI5NSw3IEBAIHN0YXRpYyB2 b2lkIHJ1blRlc3QoY29uc3Qgc3RyaW5nJiBpbnB1dExpbmUpCiAKICAgICBUZXN0Q29tbWFuZCBj b21tYW5kID0gcGFyc2VJbnB1dExpbmUoaW5wdXRMaW5lKTsKICAgICBjb25zdCBzdHJpbmcmIHBh dGhPclVSTCA9IGNvbW1hbmQucGF0aE9yVVJMOwotICAgIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVz dCA9IGNvbW1hbmQuc2hvdWxkRHVtcFBpeGVsczsKKyAgICBkdW1wUGl4ZWxzRm9yQ3VycmVudFRl c3QgPSBjb21tYW5kLnNob3VsZER1bXBQaXhlbHMgfHwgZHVtcFBpeGVsc0ZvckFsbFRlc3RzOwog CiAgICAgTlNTdHJpbmcgKnBhdGhPclVSTFN0cmluZyA9IFtOU1N0cmluZyBzdHJpbmdXaXRoVVRG OFN0cmluZzpwYXRoT3JVUkwuY19zdHIoKV07CiAgICAgaWYgKCFwYXRoT3JVUkxTdHJpbmcpIHsK ZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlTWFpbi5j cHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZU1haW4uY3BwCmluZGV4 IDFiYWFlN2NiOGUxYTQ2MTFhMjU3ZjhiZmI3N2NkYjg0NWZhOTYwZGMuLjM5MjE5NDAxMmRkNDdh MDc2NmJiNGE1ZGY5ZTYzOTJjMzUxMTgwMWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL3F0L0R1bXBSZW5kZXJUcmVlTWFpbi5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv cXQvRHVtcFJlbmRlclRyZWVNYWluLmNwcApAQCAtNjYsMTEgKzY2LDExIEBAIHZvaWQgbWVzc2Fn ZUhhbmRsZXIoUXRNc2dUeXBlIHR5cGUsIGNvbnN0IFFNZXNzYWdlTG9nQ29udGV4dCYsIGNvbnN0 IFFTdHJpbmcgJm1lCiAgICAgLy8gZG8gbm90aGluZwogfQogCi0vLyBXZSBvbmx5IHN1cHBvcnQg LXYgb3IgLS1zdGRvdXQgb3IgLS1zdGRlcnIgb3IgLSwgYWxsIHRoZSBvdGhlcnMgd2lsbCBiZQor Ly8gV2Ugb25seSBzdXBwb3J0IC12LCAtcCwgLS1waXhlbC10ZXN0cywgLS1zdGRvdXQsIC0tc3Rk ZXJyIGFuZCAtLCBhbGwgdGhlIG90aGVycyB3aWxsIGJlCiAvLyBwYXNzIGFzIHRlc3QgY2FzZSBu YW1lIChldmVuIC1hYmMuaHRtbCBpcyBhIHZhbGlkIHRlc3QgY2FzZSBuYW1lKQogYm9vbCBpc09w dGlvbihjb25zdCBRU3RyaW5nJiBzdHIpCiB7Ci0gICAgcmV0dXJuIHN0ciA9PSBRU3RyaW5nKCIt diIpCisgICAgcmV0dXJuIHN0ciA9PSBRU3RyaW5nKCItdiIpIHx8IHN0ciA9PSBRU3RyaW5nKCIt LXBpeGVsLXRlc3RzIikKICAgICAgICAgICAgfHwgc3RyID09IFFTdHJpbmcoIi0tc3Rkb3V0Iikg fHwgc3RyID09IFFTdHJpbmcoIi0tc3RkZXJyIikKICAgICAgICAgICAgfHwgc3RyID09IFFTdHJp bmcoIi0tdGltZW91dCIpIHx8IHN0ciA9PSBRU3RyaW5nKCItLW5vLXRpbWVvdXQiKQogICAgICAg ICAgICB8fCBzdHIgPT0gUVN0cmluZygiLSIpOwpAQCAtODksOCArODksOCBAQCBRU3RyaW5nIHRh a2VPcHRpb25WYWx1ZShRU3RyaW5nTGlzdCYgYXJndW1lbnRzLCBpbnQgaW5kZXgpCiAKIHZvaWQg cHJpbnRVc2FnZSgpCiB7Ci0gICAgZnByaW50ZihzdGRlcnIsICJVc2FnZTogRHVtcFJlbmRlclRy ZWUgWy12XSBbLS1zdGRvdXQgb3V0cHV0X2ZpbGVuYW1lXSBbLXN0ZGVyciBlcnJvcl9maWxlbmFt ZV0gWy0tbm8tdGltZW91dF0gWy0tdGltZW91dCB0aW1lb3V0X01TXSBmaWxlbmFtZSBbZmlsZW5h bWUyLi5uXVxuIik7Ci0gICAgZnByaW50ZihzdGRlcnIsICJPciBmb2xkZXIgY29udGFpbmluZyB0 ZXN0IGZpbGVzOiBEdW1wUmVuZGVyVHJlZSBbLXZdIGRpcnBhdGhcbiIpOworICAgIGZwcmludGYo c3RkZXJyLCAiVXNhZ2U6IER1bXBSZW5kZXJUcmVlIFstdnwtLXBpeGVsLXRlc3RzXSBbLS1zdGRv dXQgb3V0cHV0X2ZpbGVuYW1lXSBbLXN0ZGVyciBlcnJvcl9maWxlbmFtZV0gWy0tbm8tdGltZW91 dF0gWy0tdGltZW91dCB0aW1lb3V0X01TXSBmaWxlbmFtZSBbZmlsZW5hbWUyLi5uXVxuIik7Cisg ICAgZnByaW50ZihzdGRlcnIsICJPciBmb2xkZXIgY29udGFpbmluZyB0ZXN0IGZpbGVzOiBEdW1w UmVuZGVyVHJlZSBbLXZ8LS1waXhlbC10ZXN0c10gZGlycGF0aFxuIik7CiAgICAgZmZsdXNoKHN0 ZGVycik7CiB9CiAKQEAgLTE1Niw2ICsxNTYsMTIgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIq IGFyZ3ZbXSkKICAgICAgICAgICAgIGV4aXQoMSk7CiAgICAgICAgIH0KICAgICB9CisgICAgaW5k ZXggPSBhcmdzLmluZGV4T2YoIi0tcGl4ZWwtdGVzdHMiKTsKKyAgICBpZiAoaW5kZXggIT0gLTEp IHsKKyAgICAgICAgZHVtcGVyLnNldFNob3VsZER1bXBQaXhlbHNGb3JBbGxUZXN0cygpOworICAg ICAgICBhcmdzLnJlbW92ZUF0KGluZGV4KTsKKyAgICB9CisKICAgICBRV2ViRGF0YWJhc2U6OnJl bW92ZUFsbERhdGFiYXNlcygpOwogCiAgICAgaW5kZXggPSBhcmdzLmluZGV4T2YoUUxhdGluMVN0 cmluZygiLS10aW1lb3V0IikpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQv RHVtcFJlbmRlclRyZWVRdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVy VHJlZVF0LmNwcAppbmRleCAwZDI4Y2JjYzExODdmNWUxOTk0OTk3OTAwMDRhZDM5YmQ3NTY5ZmMw Li5jZDVlN2FhMjI3NDQwZWViNmE4OWNiMTA4OTIxMWVmOGQzNGE3MTFhIDEwMDc1NQotLS0gYS9U b29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAorKysgYi9Ub29scy9E dW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcApAQCAtMzg5LDcgKzM4OSw4IEBA IFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpXZWJWaWV3R3JhcGhpY3NCYXNlZChRV2lkZ2V0KiBwYXJl bnQpCiB9CiAKIER1bXBSZW5kZXJUcmVlOjpEdW1wUmVuZGVyVHJlZSgpCi0gICAgOiBtX3N0ZGlu KDApCisgICAgOiBtX2R1bXBQaXhlbHNGb3JBbGxUZXN0cyhmYWxzZSkKKyAgICAsIG1fc3RkaW4o MCkKICAgICAsIG1fZW5hYmxlVGV4dE91dHB1dChmYWxzZSkKICAgICAsIG1fc3RhbmRBbG9uZU1v ZGUoZmFsc2UpCiAgICAgLCBtX2dyYXBoaWNzQmFzZWQoZmFsc2UpCkBAIC02OTIsNyArNjkzLDcg QEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6cHJvY2Vzc0xpbmUoY29uc3QgUVN0cmluZyAmaW5wdXQp CiB7CiAgICAgVGVzdENvbW1hbmQgY29tbWFuZCA9IHBhcnNlSW5wdXRMaW5lKHN0ZDo6c3RyaW5n KGlucHV0LnRvTGF0aW4xKCkuY29uc3REYXRhKCkpKTsKICAgICBRU3RyaW5nIHBhdGhPclVSTCA9 IFFMYXRpbjFTdHJpbmcoY29tbWFuZC5wYXRoT3JVUkwuY19zdHIoKSk7Ci0gICAgbV9kdW1wUGl4 ZWxzRm9yQ3VycmVudFRlc3QgPSBjb21tYW5kLnNob3VsZER1bXBQaXhlbHM7CisgICAgbV9kdW1w UGl4ZWxzRm9yQ3VycmVudFRlc3QgPSBjb21tYW5kLnNob3VsZER1bXBQaXhlbHMgfHwgbV9kdW1w UGl4ZWxzRm9yQWxsVGVzdHM7CiAgICAgbV9leHBlY3RlZEhhc2ggPSBRTGF0aW4xU3RyaW5nKGNv bW1hbmQuZXhwZWN0ZWRQaXhlbEhhc2guY19zdHIoKSk7CiAKICAgICBpZiAocGF0aE9yVVJMLnN0 YXJ0c1dpdGgoUUxhdGluMVN0cmluZygiaHR0cDoiKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL3F0L0R1bXBSZW5kZXJUcmVlUXQuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0 L0R1bXBSZW5kZXJUcmVlUXQuaAppbmRleCA3MTBmMTczNDM3ODRhNzNhMTk1ZjUxNzI5MmMzZDZk YjBhNWJmOGI3Li45ODQyOWM0NGVjOTMxMTMyMDA3ZTRkOGYzYWFjYWU0ZGM5Zjk2Njc4IDEwMDY0 NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmgKKysrIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5oCkBAIC0xMDUsNiArMTA1 LDcgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRUaW1lb3V0KGludCk7CiAgICAgdm9pZCBzZXRT aG91bGRUaW1lb3V0KGJvb2wgZmxhZyk7CisgICAgdm9pZCBzZXRTaG91bGREdW1wUGl4ZWxzRm9y QWxsVGVzdHMoKSB7IG1fZHVtcFBpeGVsc0ZvckFsbFRlc3RzID0gdHJ1ZTsgfQogCiBwdWJsaWMg UV9TTE9UUzoKICAgICB2b2lkIGluaXRKU09iamVjdHMoKTsKQEAgLTE0MSw2ICsxNDIsNyBAQCBw cml2YXRlOgogICAgIFRlc3RSdW5uZXIgKm1fY29udHJvbGxlcjsKIAogICAgIGJvb2wgbV9kdW1w UGl4ZWxzRm9yQ3VycmVudFRlc3Q7CisgICAgYm9vbCBtX2R1bXBQaXhlbHNGb3JBbGxUZXN0czsK ICAgICBRU3RyaW5nIG1fZXhwZWN0ZWRIYXNoOwogICAgIFFTdHJpbmdMaXN0IG1fc3RhbmRBbG9u ZU1vZGVUZXN0TGlzdDsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1 bXBSZW5kZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9EdW1wUmVuZGVyVHJl ZS5jcHAKaW5kZXggYWQxNzI2ZGM5NTJmMmU3YWYxZTgxYmU3NTA3Yjg3ZDAxMjUwNTM5Ny4uMTcz ZjM0NTc0ZmNmMzI4YTQ4YzJjMGRiNTAyM2E5MmZmYzVkMTI3MCAxMDA2NDQKLS0tIGEvVG9vbHMv RHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCkBAIC04MCw2ICs4MCw3IEBAIHN0YXRpYyBM UENXU1RSIGZvbnRzRW52aXJvbm1lbnRWYXJpYWJsZSA9IEwiV0VCS0lUX1RFU1RGT05UUyI7CiBj b25zdCBMUENXU1RSIGtEdW1wUmVuZGVyVHJlZUNsYXNzTmFtZSA9IEwiRHVtcFJlbmRlclRyZWVX aW5kb3ciOwogCiBzdGF0aWMgYm9vbCBkdW1wVHJlZSA9IHRydWU7CitzdGF0aWMgYm9vbCBkdW1w UGl4ZWxzRm9yQWxsVGVzdHMgPSBmYWxzZTsKIHN0YXRpYyBib29sIGR1bXBQaXhlbHNGb3JDdXJy ZW50VGVzdDsKIHN0YXRpYyBib29sIGR1bXBBbGxQaXhlbHM7CiBzdGF0aWMgYm9vbCBwcmludFNl cGFyYXRvcnM7CkBAIC05NTIsNyArOTUzLDcgQEAgc3RhdGljIHZvaWQgcnVuVGVzdChjb25zdCBz dHJpbmcmIGlucHV0TGluZSkKIHsKICAgICBUZXN0Q29tbWFuZCBjb21tYW5kID0gcGFyc2VJbnB1 dExpbmUoaW5wdXRMaW5lKTsKICAgICBjb25zdCBzdHJpbmcmIHBhdGhPclVSTCA9IGNvbW1hbmQu cGF0aE9yVVJMOwotICAgIGR1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCA9IGNvbW1hbmQuc2hvdWxk RHVtcFBpeGVsczsKKyAgICBkdW1wUGl4ZWxzRm9yQ3VycmVudFRlc3QgPSBjb21tYW5kLnNob3Vs ZER1bXBQaXhlbHMgfHwgZHVtcFBpeGVsc0ZvckFsbFRlc3RzOwogCiAgICAgc3RhdGljIEJTVFIg bWV0aG9kQlN0ciA9IFN5c0FsbG9jU3RyaW5nKFRFWFQoIkdFVCIpKTsKIApAQCAtMTM0MSw2ICsx MzQyLDExIEBAIGV4dGVybiAiQyIgX19kZWNsc3BlYyhkbGxleHBvcnQpIGludCBXSU5BUEkgZGxs TGF1bmNoZXJFbnRyeVBvaW50KGludCBhcmdjLCBjb25zCiAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgfQogCisgICAgICAgIGlmICghc3RyaWNtcChhcmd2W2ldLCAiLS1waXhlbC10ZXN0 cyIpKSB7CisgICAgICAgICAgICBkdW1wUGl4ZWxzRm9yQWxsVGVzdHMgPSB0cnVlOworICAgICAg ICAgICAgY29udGludWU7CisgICAgICAgIH0KKwogICAgICAgICB0ZXN0cy5hcHBlbmQoYXJndltp XSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS93eC9EdW1wUmVu ZGVyVHJlZVd4LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0R1bXBSZW5kZXJUcmVlV3gu Y3BwCmluZGV4IDUzOGZmMjQ5ZDA0OThjZmI1MDc1ZTczYmY0YmJiMDE2NjZiMGYxOWMuLmNhZGVj YWY4ZjA1ZmM4MWQ1OWQ3MGQ1MGE2OTdlNDlhMzM5OTlhNTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL3d4L0R1bXBSZW5kZXJUcmVlV3guY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL3d4L0R1bXBSZW5kZXJUcmVlV3guY3BwCkBAIC01MCw2ICs1MCw3IEBACiB2b2xhdGls ZSBib29sIGRvbmUgPSB0cnVlOwogdm9sYXRpbGUgYm9vbCBub3RpZmllZCA9IGZhbHNlOwogc3Rh dGljIGJvb2wgcHJpbnRTZXBhcmF0b3JzID0gdHJ1ZTsKK3N0YXRpYyBpbnQgZHVtcFBpeGVsc0Zv ckFsbFRlc3RzID0gZmFsc2U7CiBzdGF0aWMgaW50IGR1bXBQaXhlbHNGb3JDdXJyZW50VGVzdDsK IHN0YXRpYyBpbnQgZHVtcFRyZWUgPSAxOwogdGltZV90IHN0YXJ0VGltZTsgLy8gdG8gZGV0ZWN0 IHRpbWVvdXRzIC8gZmFpbGVkIHRlc3RzCkBAIC0yMjUsNyArMjI2LDcgQEAgc3RhdGljIHZvaWQg cnVuVGVzdChjb25zdCB3eFN0cmluZyBpbnB1dExpbmUpCiAKICAgICBUZXN0Q29tbWFuZCBjb21t YW5kID0gcGFyc2VJbnB1dExpbmUoc3RkOjpzdHJpbmcoaW5wdXRMaW5lLlRvQXNjaWkoKSkpOwog ICAgIHN0cmluZyYgcGF0aE9yVVJMID0gY29tbWFuZC5wYXRoT3JVUkw7Ci0gICAgZHVtcFBpeGVs c0ZvckN1cnJlbnRUZXN0ID0gY29tbWFuZC5zaG91bGREdW1wUGl4ZWxzOworICAgIGR1bXBQaXhl bHNGb3JDdXJyZW50VGVzdCA9IGNvbW1hbmQuc2hvdWxkRHVtcFBpeGVscyB8fCBkdW1wUGl4ZWxz Rm9yQWxsVGVzdHM7CiAgICAgCiAgICAgLy8gQ1VSTCBpc24ndCBoYXBweSBpZiB3ZSBkb24ndCBo YXZlIGEgcHJvdG9jb2wuCiAgICAgc2l6ZV90IGh0dHAgPSBwYXRoT3JVUkwuZmluZCgiaHR0cDov LyIpOwpAQCAtMjgxLDYgKzI4MiwxMSBAQCBib29sIE15QXBwOjpPbkluaXQoKQogICAgICAgICAg ICAgZHVtcFRyZWUgPSB0cnVlOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KKwor ICAgICAgICBpZiAoIW9wdGlvbi5DbXBOb0Nhc2UoX1QoIi0tcGl4ZWwtdGVzdHMiKSkpIHsKKyAg ICAgICAgICAgIGR1bXBQaXhlbHNGb3JBbGxUZXN0cyA9IHRydWU7CisgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgfQogICAgIH0KICAgICB3eEluaXRBbGxJbWFnZUhhbmRsZXJzKCk7CiAg ICAgICAgIApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxl ci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAppbmRleCA0 MmI4MTJlYThmNGM0MTM3YjdhNmU1NTM1ZDM4ZWU1MmI1Y2MzZDgzLi44NDc0ZDI4NTkxNDMyMjgx NGE3ZmY0ZDc4Y2M0OTg0YTBmODM5MjBkIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RD b250cm9sbGVyLmNwcApAQCAtODEsNiArODEsNyBAQCBUZXN0Q29udHJvbGxlcjo6VGVzdENvbnRy b2xsZXIoaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkKICAgICAsIG1fcHJpbnRTZXBhcmF0 b3JzKGZhbHNlKQogICAgICwgbV91c2luZ1NlcnZlck1vZGUoZmFsc2UpCiAgICAgLCBtX2djQmV0 d2VlblRlc3RzKGZhbHNlKQorICAgICwgbV9zaG91bGREdW1wUGl4ZWxzRm9yQWxsVGVzdHMoZmFs c2UpCiAgICAgLCBtX3N0YXRlKEluaXRpYWwpCiAgICAgLCBtX2RvbmVSZXNldHRpbmcoZmFsc2Up CiAgICAgLCBtX2xvbmdUaW1lb3V0KGRlZmF1bHRMb25nVGltZW91dCkKQEAgLTI4MSwxMSArMjgy LDE2IEBAIHZvaWQgVGVzdENvbnRyb2xsZXI6OmluaXRpYWxpemUoaW50IGFyZ2MsIGNvbnN0IGNo YXIqIGFyZ3ZbXSkKICAgICAgICAgICAgIG1fZ2NCZXR3ZWVuVGVzdHMgPSB0cnVlOwogICAgICAg ICAgICAgY29udGludWU7CiAgICAgICAgIH0KKyAgICAgICAgaWYgKGFyZ3VtZW50ID09ICItLXBp eGVsLXRlc3RzIikgeworICAgICAgICAgICAgbV9zaG91bGREdW1wUGl4ZWxzRm9yQWxsVGVzdHMg PSB0cnVlOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KICAgICAgICAgaWYgKGFy Z3VtZW50ID09ICItLXByaW50LXN1cHBvcnRlZC1mZWF0dXJlcyIpIHsKICAgICAgICAgICAgIHBy aW50U3VwcG9ydGVkRmVhdHVyZXMgPSB0cnVlOwogICAgICAgICAgICAgYnJlYWs7CiAgICAgICAg IH0KIAorCiAgICAgICAgIC8vIFNraXAgYW55IG90aGVyIGFyZ3VtZW50cyB0aGF0IGJlZ2luIHdp dGggJy0tJy4KICAgICAgICAgaWYgKGFyZ3VtZW50Lmxlbmd0aCgpID49IDIgJiYgYXJndW1lbnRb MF0gPT0gJy0nICYmIGFyZ3VtZW50WzFdID09ICctJykKICAgICAgICAgICAgIGNvbnRpbnVlOwpA QCAtNjEyLDcgKzYxOCw3IEBAIGJvb2wgVGVzdENvbnRyb2xsZXI6OnJ1blRlc3QoY29uc3QgY2hh ciogaW5wdXRMaW5lKQogICAgIG1fc3RhdGUgPSBSdW5uaW5nVGVzdDsKIAogICAgIG1fY3VycmVu dEludm9jYXRpb24gPSBhZG9wdFB0cihuZXcgVGVzdEludm9jYXRpb24oY29tbWFuZC5wYXRoT3JV UkwpKTsKLSAgICBpZiAoY29tbWFuZC5zaG91bGREdW1wUGl4ZWxzKQorICAgIGlmIChjb21tYW5k LnNob3VsZER1bXBQaXhlbHMgfHwgbV9zaG91bGREdW1wUGl4ZWxzRm9yQWxsVGVzdHMpCiAgICAg ICAgIG1fY3VycmVudEludm9jYXRpb24tPnNldElzUGl4ZWxUZXN0KGNvbW1hbmQuZXhwZWN0ZWRQ aXhlbEhhc2gpOwogCiAgICAgbV9jdXJyZW50SW52b2NhdGlvbi0+aW52b2tlKCk7CmRpZmYgLS1n aXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmggYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKaW5kZXggZDcxMTFjNWQzN2YzYmQ5ZmU0MDU3 YjEyM2FhMmQwZGU0MTBlYjMyZC4uZDY1NzExOTFjMmJlYTJlYjc2MGViNTZkMzBlMTA2MWMzZDk3 NzNmNCAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5o CisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaApAQCAtMTI0LDYg KzEyNCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3ByaW50U2VwYXJhdG9yczsKICAgICBib29s IG1fdXNpbmdTZXJ2ZXJNb2RlOwogICAgIGJvb2wgbV9nY0JldHdlZW5UZXN0czsKKyAgICBib29s IG1fc2hvdWxkRHVtcFBpeGVsc0ZvckFsbFRlc3RzOwogICAgIHN0ZDo6dmVjdG9yPHN0ZDo6c3Ry aW5nPiBtX3BhdGhzOwogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBtX2luamVjdGVkQnVu ZGxlUGF0aDsKICAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gbV90ZXN0UGx1Z2luRGlyZWN0 b3J5Owo=