148181 2015-08-19 12:10:46 -0700 Web Inspector: add TestHarness option to tee all commands to system console 2015-08-20 09:44:07 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 147093 1 bburg bburg bburg graouts joepeck mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1118965 0 bburg 2015-08-19 12:10:46 -0700 It should be possible to dump test output to stderr with a single line at the top of the file. This will be useful in debugging test timeouts. 1118967 1 webkit-bug-importer 2015-08-19 12:11:41 -0700 <rdar://problem/22347806> 1119062 2 259417 bburg 2015-08-19 15:36:52 -0700 Created attachment 259417 Patch 1119079 3 259417 joepeck 2015-08-19 16:12:08 -0700 Comment on attachment 259417 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259417&action=review r=me > Source/WebCore/inspector/InspectorFrontendHost.cpp:311 > - WTFLogAlways("InspectorTest: %s", message.utf8().data()); > + WTFLogAlways("%s", message.utf8().data()); It is often nice to have something to grep for, perhaps here you are thinking just use the process name / pid in output? 1119267 4 bburg 2015-08-20 09:44:07 -0700 Committed r188687: <http://trac.webkit.org/changeset/188687> 259417 2015-08-19 15:36:52 -0700 2015-08-19 16:12:08 -0700 Patch bug-148181-20150819153647.patch text/plain 12551 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWM4M2M4ZGU4ZDNiMjcz ZTQ2ZjAzOGU4ZTlkM2Y5Zjc5M2VmYjk5My4uYjgwMWY1YjM2YWIzZDJlOTFhYTc3YjQxOTZhMjNm MDUxYmZhMDM4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA4LTE5ICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBU ZXN0SGFybmVzcyBvcHRpb24gdG8gdGVlIGFsbCBjb21tYW5kcyB0byBzeXN0ZW0gY29uc29sZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4MTgxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckZyb250ZW5kSG9zdDo6dW5idWZmZXJlZExvZyk6IFJlbW92ZSBsb2cgcHJlZml4IHNvIG91dHB1 dAorICAgICAgICB0byBzdGRlcnIgY2FuIGJlIGRpZmZlZCBhZ2FpbnN0IGV4cGVjdGVkIHJlc3Vs dHMgd2l0aG91dCBwcm9jZXNzaW5nLgorCiAyMDE1LTA4LTE4ICBGaWxpcCBQaXpsbyAgPGZwaXps b0BhcHBsZS5jb20+CiAKICAgICAgICAgUmVwbGFjZSBhbGwgdXNlcyBvZiBzdGQ6Om11dGV4L3N0 ZDo6Y29uZGl0aW9uX3ZhcmlhYmxlIHdpdGggV1RGOjpMb2NrL1dURjo6Q29uZGl0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL0NoYW5nZUxvZwppbmRleCAwYmI5NDg5YmYzYTUyMTVkODNiN2E5NGU1YTBiNDkyZDQy ZmY4ZWZiLi4zZjI4NjA0ODMwNTMxNGI2Mzc0YzgxOWViMzc1ZWZjMjBhOWI5ZDA5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MiBAQAogMjAxNS0wOC0xOSAgQnJpYW4gQnVy ZyAgPGJidXJnQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgVGVzdEhh cm5lc3Mgb3B0aW9uIHRvIHRlZSBhbGwgY29tbWFuZHMgdG8gc3lzdGVtIGNvbnNvbGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODE4MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0IGlzIGN1cnJlbnRs eSBkaWZmaWN1bHQgdG8gdHJhY2Ugd2hhdCdzIGdvaW5nIG9uIHdoZW4gYSB0ZXN0IHRpbWVzIG91 dAorICAgICAgICBvbiBhIGJ1aWxkYm90IGluc3RhbmNlLiBUaGUgZXhpc3Rpbmcgb3B0aW9uIGZv ciBmb3JjaW5nIGRlYnVnIGxvZ2dpbmcgY2FuCisgICAgICAgIHN0aWxsIGRyb3AgbWVzc2FnZXMg dGhhdCBkb24ndCBtYWtlIGl0IGZyb20gdGhlIGluc3BlY3RvciB0byB0aGUgdGVzdCBwYWdlLgor CisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhbiBvcHRpb24gd2hpY2ggbG9ncyBhbGwgVGVzdEhh cm5lc3MgY29tbWFuZHMgZGlyZWN0bHkgdG8KKyAgICAgICAgc3RkZXJyIGluIHRoZSBJbnNwZWN0 b3IgaW5zdGFuY2UgdXNpbmcgSW5zcGVjdG9yRnJvbnRlbmRIb3N0Ojp1bmJ1ZmZlcmVkTG9nLgor CisgICAgICAgIENsZWFuIHVwIGhvdyBleGlzdGluZyBoYXJuZXNzIGxvZ2dpbmcgY29kZSBjYWxs cyBpbnRvIGVhY2ggb3RoZXIuIEV4dHJhY3QKKyAgICAgICAgdGhlIHN0cmluZ2lmeWluZyBjb2Rl IHRoYXQgaXMgZHVwbGljYXRlZCBldmVyeXdoZXJlLgorCisgICAgICAgICogVXNlckludGVyZmFj ZS9UZXN0Lmh0bWw6IFJlb3JnYW5pemUgb3B0aW9ucyBhbmQgYWRkIG5ldyBvcHRpb24uCisgICAg ICAgICogVXNlckludGVyZmFjZS9UZXN0L0Zyb250ZW5kVGVzdEhhcm5lc3MuanM6CisgICAgICAg IChGcm9udGVuZFRlc3RIYXJuZXNzLnByb3RvdHlwZS5jb21wbGV0ZVRlc3QpOgorICAgICAgICAo RnJvbnRlbmRUZXN0SGFybmVzcy5wcm90b3R5cGUuYWRkUmVzdWx0KToKKyAgICAgICAgKEZyb250 ZW5kVGVzdEhhcm5lc3MucHJvdG90eXBlLmRlYnVnTG9nKToKKyAgICAgICAgKEZyb250ZW5kVGVz dEhhcm5lc3MucHJvdG90eXBlLnRlc3RQYWdlRGlkTG9hZCk6CisgICAgICAgIChGcm9udGVuZFRl c3RIYXJuZXNzLnByb3RvdHlwZS5fcmVzZW5kUmVzdWx0cyk6CisgICAgICAgIChGcm9udGVuZFRl c3RIYXJuZXNzKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Rlc3QvUHJvdG9jb2xUZXN0SGFy bmVzcy5qczoKKyAgICAgICAgKFByb3RvY29sVGVzdEhhcm5lc3MucHJvdG90eXBlLmNvbXBsZXRl VGVzdCk6CisgICAgICAgIChQcm90b2NvbFRlc3RIYXJuZXNzLnByb3RvdHlwZS5hZGRSZXN1bHQp OgorICAgICAgICAoUHJvdG9jb2xUZXN0SGFybmVzcy5wcm90b3R5cGUuZGVidWdMb2cpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvVGVzdC9UZXN0SGFybmVzcy5qczoKKyAgICAgICAgKFRlc3RI YXJuZXNzLnByb3RvdHlwZS5sb2cpOgorICAgICAgICAoVGVzdEhhcm5lc3MucHJvdG90eXBlLmFz c2VydCk6CisgICAgICAgIChUZXN0SGFybmVzcy5wcm90b3R5cGUuZXhwZWN0VGhhdCk6CisgICAg ICAgIChUZXN0SGFybmVzcy5tZXNzYWdlQXNTdHJpbmcpOgorICAgICAgICAoVGVzdEhhcm5lc3Mp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVGVzdFN0dWIuaHRtbDogUmVvcmdhbml6ZSBvcHRp b25zIGFuZCBhZGQgbmV3IG9wdGlvbi4KKworMjAxNS0wOC0xOSAgQnJpYW4gQnVyZyAgPGJidXJn QGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0b3JUZXN0IHNob3Vs ZCBiZSBhIHN1YmNsYXNzIG9mIFRlc3RIYXJuZXNzCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDgwNzkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNwcAppbmRleCA1OGY1NWM2NGIyZTk1ODdi NjQwYmZhNzc1N2VkZjlhYjRjMjFiNjlkLi5iNTc1NGQ1YTUzNThmODE0OTM2MGMwM2M3MzU2ZjZl MzMwNThlYWZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmNwcApAQCAtMzA4LDcgKzMwOCw3IEBAIGJvb2wgSW5zcGVjdG9yRnJvbnRl bmRIb3N0Ojppc1VuZGVyVGVzdCgpCiB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6dW5idWZm ZXJlZExvZyhjb25zdCBTdHJpbmcmIG1lc3NhZ2UpCiB7CiAgICAgLy8gVGhpcyBpcyB1c2VkIG9u bHkgZm9yIGRlYnVnZ2luZyBpbnNwZWN0b3IgdGVzdHMuCi0gICAgV1RGTG9nQWx3YXlzKCJJbnNw ZWN0b3JUZXN0OiAlcyIsIG1lc3NhZ2UudXRmOCgpLmRhdGEoKSk7CisgICAgV1RGTG9nQWx3YXlz KCIlcyIsIG1lc3NhZ2UudXRmOCgpLmRhdGEoKSk7CiB9CiAKIHZvaWQgSW5zcGVjdG9yRnJvbnRl bmRIb3N0OjpiZWVwKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Rlc3QuaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rl c3QuaHRtbAppbmRleCA4NWM3NmFjZDU5MDg2NzI3NDY2ZWJhZjU0NTI3ZWIyYjA4MjQ1ZDZhLi5j YmRlZmJiNjYyYjRmYmI0MTE5OWIyNTU2OTVkMjdkYTZjMTQyNWZhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0Lmh0bWwKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC5odG1sCkBAIC0xNDcsMTIgKzE0NywxNCBA QAogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KICAgICAgICAgV2ViSW5zcGVj dG9yLmxvYWRlZCgpOwogCi0gICAgICAgIC8vIE5vdCByZWxpYWJsZSB1bmxlc3MgY29uc29sZSBt ZXNzYWdlcyBhcmUgZHVtcGVkIHRvIHN0ZGVyci4KLSAgICAgICAgLy8gU2VlIHdpa2kgZm9yIGRl dGFpbHMgPGh0dHBzOi8vaHR0cDovL3RyYWMud2Via2l0Lm9yZy93aWtpL1dlYkluc3BlY3RvckRl YnVnZ2luZz4uCi0gICAgICAgIEluc3BlY3RvckJhY2tlbmQuZHVtcEluc3BlY3RvclByb3RvY29s TWVzc2FnZXMgPSBmYWxzZTsKKyAgICAgICAgLy8gRGVidWcgbG9nZ2luZyBpcyBzeW5jaHJvbm91 cyBvbiB0aGUgdGVzdCBwYWdlLgorICAgICAgICBJbnNwZWN0b3JUZXN0LmZvcmNlRGVidWdMb2dn aW5nID0gZmFsc2U7CisKKyAgICAgICAgLy8gVGVlIGFsbCBUZXN0SGFybmVzcyBjb21tYW5kcyB0 byBzdGRlcnIgZnJvbSB3aXRoaW4gdGhlIEluc3BlY3Rvci4KKyAgICAgICAgSW5zcGVjdG9yVGVz dC5kdW1wQWN0aXZpdHlUb1N5c3RlbUNvbnNvbGUgPSBmYWxzZTsKIAotICAgICAgICAvLyBTeW5j aHJvbm91cyBsb2dnaW5nIG1heSBwcm9kdWNlIG1vcmUgb3V0cHV0IHByaW9yIHRvIGEgdGltZW91 dC4KLSAgICAgICAgSW5zcGVjdG9yVGVzdC5mb3JjZVN5bmNEZWJ1Z0xvZ2dpbmcgPSBmYWxzZTsK KyAgICAgICAgLy8gQmVzdCB1c2VkIGluIGNvbWJpbmF0aW9uIHdpdGggZHVtcEFjdGl2aXR5VG9T eXN0ZW1Db25zb2xlLgorICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLmR1bXBJbnNwZWN0b3JQcm90 b2NvbE1lc3NhZ2VzID0gZmFsc2U7CiAgICAgPC9zY3JpcHQ+CiA8L2hlYWQ+CiA8Ym9keT4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvRnJvbnRl bmRUZXN0SGFybmVzcy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rl c3QvRnJvbnRlbmRUZXN0SGFybmVzcy5qcwppbmRleCA5NjE3OGY2M2RmMjFiYmI3NTI1OTFhZmFh Njc2NmE2NjZjN2UxZDAzLi4zYTFkZWUxMjMwM2EyZGFkOTQ5MzU5NmM0YTU1NzViYjI4Zjk4MGEw IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L0Zy b250ZW5kVGVzdEhhcm5lc3MuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVGVzdC9Gcm9udGVuZFRlc3RIYXJuZXNzLmpzCkBAIC0zNyw4ICszNyw4IEBAIEZyb250 ZW5kVGVzdEhhcm5lc3MgPSBjbGFzcyBGcm9udGVuZFRlc3RIYXJuZXNzIGV4dGVuZHMgVGVzdEhh cm5lc3MKIAogICAgIGNvbXBsZXRlVGVzdCgpCiAgICAgewotICAgICAgICBpZiAodGhpcy5mb3Jj ZVN5bmNEZWJ1Z0xvZ2dpbmcpCi0gICAgICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QudW5i dWZmZXJlZExvZygiRnJvbnRlbmRUZXN0SGFybmVzcy5jb21wbGV0ZVRlc3QoKSIpOworICAgICAg ICBpZiAodGhpcy5kdW1wQWN0aXZpdHlUb1N5c3RlbUNvbnNvbGUpCisgICAgICAgICAgICBJbnNw ZWN0b3JGcm9udGVuZEhvc3QudW5idWZmZXJlZExvZygiY29tcGxldGVUZXN0KCkiKTsKIAogICAg ICAgICAvLyBXYWl0IGZvciByZXN1bHRzIHRvIGJlIHJlc2VudCBiZWZvcmUgcmVxdWVzdGluZyBj b21wbGV0ZVRlc3QoKS4gT3RoZXJ3aXNlLCBtZXNzYWdlcyB3aWxsIGJlCiAgICAgICAgIC8vIHF1 ZXVlZCBhZnRlciBwZW5kaW5nIGRpc3BhdGNoZXMgcnVuIHRvIHplcm8gYW5kIHRoZSB0ZXN0IHBh Z2Ugd2lsbCBxdWl0IGJlZm9yZSBwcm9jZXNzaW5nIHRoZW0uCkBAIC01MiwxOCArNTIsMjUgQEAg RnJvbnRlbmRUZXN0SGFybmVzcyA9IGNsYXNzIEZyb250ZW5kVGVzdEhhcm5lc3MgZXh0ZW5kcyBU ZXN0SGFybmVzcwogCiAgICAgYWRkUmVzdWx0KG1lc3NhZ2UpCiAgICAgewotICAgICAgICB0aGlz Ll9yZXN1bHRzLnB1c2gobWVzc2FnZSk7CisgICAgICAgIGxldCBzdHJpbmdpZmllZE1lc3NhZ2Ug PSBUZXN0SGFybmVzcy5tZXNzYWdlQXNTdHJpbmcobWVzc2FnZSk7CiAKLSAgICAgICAgaWYgKHRo aXMuZm9yY2VTeW5jRGVidWdMb2dnaW5nKQotICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRI b3N0LnVuYnVmZmVyZWRMb2coImFkZFJlc3VsdDogIiArIG1lc3NhZ2UpOworICAgICAgICAvLyBT YXZlIHRoZSBzdHJpbmdpZmllZCBtZXNzYWdlLCBzaW5jZSBtZXNzYWdlIG1heSBiZSBhIERPTSBl bGVtZW50IHRoYXQgd29uJ3Qgc3Vydml2ZSByZWxvYWQuCisgICAgICAgIHRoaXMuX3Jlc3VsdHMu cHVzaChzdHJpbmdpZmllZE1lc3NhZ2UpOworCisgICAgICAgIGlmICh0aGlzLmR1bXBBY3Rpdml0 eVRvU3lzdGVtQ29uc29sZSkKKyAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC51bmJ1 ZmZlcmVkTG9nKHN0cmluZ2lmaWVkTWVzc2FnZSk7CiAKICAgICAgICAgaWYgKCF0aGlzLl90ZXN0 UGFnZUlzUmVsb2FkaW5nKQotICAgICAgICAgICAgdGhpcy5ldmFsdWF0ZUluUGFnZShgVGVzdFBh Z2UuYWRkUmVzdWx0KHVuZXNjYXBlKCIke2VzY2FwZShtZXNzYWdlKX0iKSlgKTsKKyAgICAgICAg ICAgIHRoaXMuZXZhbHVhdGVJblBhZ2UoYFRlc3RQYWdlLmFkZFJlc3VsdCh1bmVzY2FwZSgiJHtl c2NhcGUoc3RyaW5naWZpZWRNZXNzYWdlKX0iKSlgKTsKICAgICB9CiAKICAgICBkZWJ1Z0xvZyht ZXNzYWdlKQogICAgIHsKLSAgICAgICAgbGV0IHN0cmluZ2lmaWVkTWVzc2FnZSA9IHR5cGVvZiBt ZXNzYWdlICE9PSAic3RyaW5nIiA/IEpTT04uc3RyaW5naWZ5KG1lc3NhZ2UpIDogbWVzc2FnZTsK KyAgICAgICAgbGV0IHN0cmluZ2lmaWVkTWVzc2FnZSA9IFRlc3RIYXJuZXNzLm1lc3NhZ2VBc1N0 cmluZyhtZXNzYWdlKTsKKworICAgICAgICBpZiAodGhpcy5kdW1wQWN0aXZpdHlUb1N5c3RlbUNv bnNvbGUpCisgICAgICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QudW5idWZmZXJlZExvZyhz dHJpbmdpZmllZE1lc3NhZ2UpOworCiAgICAgICAgIHRoaXMuZXZhbHVhdGVJblBhZ2UoYFRlc3RQ YWdlLmRlYnVnTG9nKHVuZXNjYXBlKCIke2VzY2FwZShzdHJpbmdpZmllZE1lc3NhZ2UpfSIpKTtg KTsKICAgICB9CiAKQEAgLTkyLDYgKzk5LDkgQEAgRnJvbnRlbmRUZXN0SGFybmVzcyA9IGNsYXNz IEZyb250ZW5kVGVzdEhhcm5lc3MgZXh0ZW5kcyBUZXN0SGFybmVzcwogCiAgICAgdGVzdFBhZ2VE aWRMb2FkKCkKICAgICB7CisgICAgICAgIGlmICh0aGlzLmR1bXBBY3Rpdml0eVRvU3lzdGVtQ29u c29sZSkKKyAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC51bmJ1ZmZlcmVkTG9nKCJ0 ZXN0UGFnZURpZExvYWQoKSIpOworCiAgICAgICAgIHRoaXMuX3Rlc3RQYWdlSXNSZWxvYWRpbmcg PSBmYWxzZTsKICAgICAgICAgdGhpcy5fcmVzZW5kUmVzdWx0cygpOwogCkBAIC0xNjMsNiArMTcz LDkgQEAgRnJvbnRlbmRUZXN0SGFybmVzcyA9IGNsYXNzIEZyb250ZW5kVGVzdEhhcm5lc3MgZXh0 ZW5kcyBUZXN0SGFybmVzcwogICAgICAgICBjb25zb2xlLmFzc2VydCh0aGlzLl9zaG91bGRSZXNl bmRSZXN1bHRzKTsKICAgICAgICAgdGhpcy5fc2hvdWxkUmVzZW5kUmVzdWx0cyA9IGZhbHNlOwog CisgICAgICAgIGlmICh0aGlzLmR1bXBBY3Rpdml0eVRvU3lzdGVtQ29uc29sZSkKKyAgICAgICAg ICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC51bmJ1ZmZlcmVkTG9nKCJfcmVzZW5kUmVzdWx0cygp Iik7CisKICAgICAgICAgZm9yIChsZXQgcmVzdWx0IG9mIHRoaXMuX3Jlc3VsdHMpCiAgICAgICAg ICAgICB0aGlzLmV2YWx1YXRlSW5QYWdlKGBUZXN0UGFnZS5hZGRSZXN1bHQodW5lc2NhcGUoIiR7 ZXNjYXBlKHJlc3VsdCl9IikpYCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9Qcm90b2NvbFRlc3RIYXJuZXNzLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9Qcm90b2NvbFRlc3RIYXJuZXNzLmpz CmluZGV4IDE2YmZkZGM0MGViOTQ5MjkxNWFjZjM3NjdhZjJjZDQ1ZThlMGFhYmYuLjljZjdmMjk4 ODdjMTU2OWNlYTE5ZjM4NmE4YTk4N2ZlMzg0NzRlZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvUHJvdG9jb2xUZXN0SGFybmVzcy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Byb3RvY29sVGVzdEhh cm5lc3MuanMKQEAgLTI5LDIwICsyOSwzMSBAQCBQcm90b2NvbFRlc3RIYXJuZXNzID0gY2xhc3Mg UHJvdG9jb2xUZXN0SGFybmVzcyBleHRlbmRzIFRlc3RIYXJuZXNzCiAKICAgICBjb21wbGV0ZVRl c3QoKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuZHVtcEFjdGl2aXR5VG9TeXN0ZW1Db25zb2xl KQorICAgICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnVuYnVmZmVyZWRMb2coImNvbXBs ZXRlVGVzdCgpIik7CisKICAgICAgICAgdGhpcy5ldmFsdWF0ZUluUGFnZSgiVGVzdFBhZ2UuY2xv c2VUZXN0KCk7Iik7CiAgICAgfQogCiAgICAgYWRkUmVzdWx0KG1lc3NhZ2UpCiAgICAgeworICAg ICAgICBsZXQgc3RyaW5naWZpZWRNZXNzYWdlID0gVGVzdEhhcm5lc3MubWVzc2FnZUFzU3RyaW5n KG1lc3NhZ2UpOworCisgICAgICAgIGlmICh0aGlzLmR1bXBBY3Rpdml0eVRvU3lzdGVtQ29uc29s ZSkKKyAgICAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC51bmJ1ZmZlcmVkTG9nKHN0cmlu Z2lmaWVkTWVzc2FnZSk7CisKICAgICAgICAgLy8gVW5mb3J0dW5hdGVseSwgZXZlcnkgc3RyaW5n IGFyZ3VtZW50IG11c3QgYmUgZXNjYXBlZCBiZWNhdXNlIHRlc3RzIGFyZSBub3QgY29uc2lzdGVu dAogICAgICAgICAvLyB3aXRoIHJlc3BlY3QgdG8gZXNjYXBpbmcgd2l0aCBzaW5nbGUgb3IgZG91 YmxlIHF1b3Rlcy4gU29tZSBleGNlcHRpb25zIHVzZSBzaW5nbGUgcXVvdGVzLgotICAgICAgICBs ZXQgc3RyaW5naWZpZWRNZXNzYWdlID0gdHlwZW9mIG1lc3NhZ2UgIT09ICJzdHJpbmciID8gSlNP Ti5zdHJpbmdpZnkobWVzc2FnZSkgOiBtZXNzYWdlOwogICAgICAgICB0aGlzLmV2YWx1YXRlSW5Q YWdlKGBUZXN0UGFnZS5sb2codW5lc2NhcGUoIiR7ZXNjYXBlKHN0cmluZ2lmaWVkTWVzc2FnZSl9 IikpO2ApOwogICAgIH0KIAogICAgIGRlYnVnTG9nKG1lc3NhZ2UpCiAgICAgewotICAgICAgICBs ZXQgc3RyaW5naWZpZWRNZXNzYWdlID0gdHlwZW9mIG1lc3NhZ2UgIT09ICJzdHJpbmciID8gSlNP Ti5zdHJpbmdpZnkobWVzc2FnZSkgOiBtZXNzYWdlOworICAgICAgICBsZXQgc3RyaW5naWZpZWRN ZXNzYWdlID0gVGVzdEhhcm5lc3MubWVzc2FnZUFzU3RyaW5nKG1lc3NhZ2UpOworCisgICAgICAg IGlmICh0aGlzLmR1bXBBY3Rpdml0eVRvU3lzdGVtQ29uc29sZSkKKyAgICAgICAgICAgIEluc3Bl Y3RvckZyb250ZW5kSG9zdC51bmJ1ZmZlcmVkTG9nKHN0cmluZ2lmaWVkTWVzc2FnZSk7CisKICAg ICAgICAgdGhpcy5ldmFsdWF0ZUluUGFnZShgVGVzdFBhZ2UuZGVidWdMb2codW5lc2NhcGUoIiR7 ZXNjYXBlKHN0cmluZ2lmaWVkTWVzc2FnZSl9IikpO2ApOwogICAgIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0SGFybmVzcy5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QvVGVzdEhhcm5lc3MuanMK aW5kZXggMWQwOGMxMTkwMmMzZjczMzJhMTE4ODA5N2MyNDIxNDU4OTA2ZmQ0ZC4uM2I2YTMzMmMz M2E5NmEwOTM2NTRlYzI2MGUyNjIyMmRjZTM2ZGY1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC9UZXN0SGFybmVzcy5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0L1Rlc3RIYXJuZXNzLmpzCkBAIC03MSw3 ICs3MSw3IEBAIFRlc3RIYXJuZXNzID0gY2xhc3MgVGVzdEhhcm5lc3MgZXh0ZW5kcyBXZWJJbnNw ZWN0b3IuT2JqZWN0CiAgICAgewogICAgICAgICArK3RoaXMuX2xvZ0NvdW50OwogCi0gICAgICAg IGlmICh0aGlzLmZvcmNlU3luY0RlYnVnTG9nZ2luZykKKyAgICAgICAgaWYgKHRoaXMuZm9yY2VE ZWJ1Z0xvZ2dpbmcpCiAgICAgICAgICAgICB0aGlzLmRlYnVnTG9nKG1lc3NhZ2UpOwogICAgICAg ICBlbHNlCiAgICAgICAgICAgICB0aGlzLmFkZFJlc3VsdChtZXNzYWdlKTsKQEAgLTgyLDE0ICs4 MiwyNCBAQCBUZXN0SGFybmVzcyA9IGNsYXNzIFRlc3RIYXJuZXNzIGV4dGVuZHMgV2ViSW5zcGVj dG9yLk9iamVjdAogICAgICAgICBpZiAoY29uZGl0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwog Ci0gICAgICAgIGxldCBzdHJpbmdpZmllZE1lc3NhZ2UgPSB0eXBlb2YgbWVzc2FnZSAhPT0gIm9i amVjdCIgPyBtZXNzYWdlIDogSlNPTi5zdHJpbmdpZnkobWVzc2FnZSk7Ci0gICAgICAgIHRoaXMu YWRkUmVzdWx0KCJBU1NFUlQ6ICIgKyBzdHJpbmdpZmllZE1lc3NhZ2UpOworICAgICAgICBsZXQg c3RyaW5naWZpZWRNZXNzYWdlID0gVGVzdEhhcm5lc3MubWVzc2FnZUFzU3RyaW5nKG1lc3NhZ2Up OworICAgICAgICB0aGlzLmxvZygiQVNTRVJUOiAiICsgc3RyaW5naWZpZWRNZXNzYWdlKTsKICAg ICB9CiAKICAgICBleHBlY3RUaGF0KGNvbmRpdGlvbiwgbWVzc2FnZSkKICAgICB7CiAgICAgICAg IGxldCBwcmVmaXggPSBjb25kaXRpb24gPyAiUEFTUyIgOiAiRkFJTCI7Ci0gICAgICAgIGxldCBz dHJpbmdpZmllZE1lc3NhZ2UgPSB0eXBlb2YgbWVzc2FnZSAhPT0gIm9iamVjdCIgPyBtZXNzYWdl IDogSlNPTi5zdHJpbmdpZnkobWVzc2FnZSk7Ci0gICAgICAgIHRoaXMuYWRkUmVzdWx0KGAke3By ZWZpeH06ICR7c3RyaW5naWZpZWRNZXNzYWdlfWApOworICAgICAgICBsZXQgc3RyaW5naWZpZWRN ZXNzYWdlID0gVGVzdEhhcm5lc3MubWVzc2FnZUFzU3RyaW5nKG1lc3NhZ2UpOworICAgICAgICB0 aGlzLmxvZyhgJHtwcmVmaXh9OiAke3N0cmluZ2lmaWVkTWVzc2FnZX1gKTsKKyAgICB9CisKKyAg ICAvLyBQcm90ZWN0ZWQKKworICAgIHN0YXRpYyBtZXNzYWdlQXNTdHJpbmcobWVzc2FnZSkKKyAg ICB7CisgICAgICAgIGlmIChtZXNzYWdlIGluc3RhbmNlb2YgRWxlbWVudCkKKyAgICAgICAgICAg IHJldHVybiBtZXNzYWdlLnRleHRDb250ZW50OworICAgICAgICAKKyAgICAgICAgcmV0dXJuICh0 eXBlb2YgbWVzc2FnZSAhPT0gInN0cmluZyIpID8gSlNPTi5zdHJpbmdpZnkobWVzc2FnZSkgOiBt ZXNzYWdlOwogICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9UZXN0U3R1Yi5odG1sIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVGVzdFN0dWIuaHRtbAppbmRleCAzMDk3MGQzMDMxMTQzNDZmMmRkZmQyODMyMjZjOThl ZTY1NTMxNGJjLi45YTQ1MmM1MjA2ZWZhYzM3YTZjZWFjY2ZjMGYxMTM2MzBmZTJlMzI3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0U3R1Yi5odG1s CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3RTdHViLmh0bWwK QEAgLTQwLDEyICs0MCwxNCBAQCBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiAgICAgPHNjcmlwdCBzcmM9IlRlc3QvVGVz dFN0dWIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQ+Ci0gICAgICAgIC8vIE5vdCByZWxpYWJs ZSB1bmxlc3MgY29uc29sZSBtZXNzYWdlcyBhcmUgZHVtcGVkIHRvIGNvbnNvbGUuCi0gICAgICAg IC8vIFNlZSB3aWtpIGZvciBkZXRhaWxzIDxodHRwczovL2h0dHA6Ly90cmFjLndlYmtpdC5vcmcv d2lraS9XZWJJbnNwZWN0b3JEZWJ1Z2dpbmc+LgotICAgICAgICBQcm90b2NvbFRlc3QuZHVtcElu c3BlY3RvclByb3RvY29sTWVzc2FnZXMgPSBmYWxzZTsKKyAgICAgICAgLy8gRGVidWcgbG9nZ2lu ZyBpcyBzeW5jaHJvbm91cyBvbiB0aGUgdGVzdCBwYWdlLgorICAgICAgICBQcm90b2NvbFRlc3Qu Zm9yY2VEZWJ1Z0xvZ2dpbmcgPSBmYWxzZTsKIAotICAgICAgICAvLyBTeW5jaHJvbm91cyBsb2dn aW5nIG1heSBwcm9kdWNlIG1vcmUgb3V0cHV0IHByaW9yIHRvIGEgdGltZW91dC4KLSAgICAgICAg UHJvdG9jb2xUZXN0LmZvcmNlU3luY0RlYnVnTG9nZ2luZyA9IGZhbHNlOworICAgICAgICAvLyBU ZWUgYWxsIFRlc3RIYXJuZXNzIGNvbW1hbmRzIHRvIHN0ZGVyciBmcm9tIHdpdGhpbiB0aGUgSW5z cGVjdG9yLgorICAgICAgICBQcm90b2NvbFRlc3QuZHVtcEFjdGl2aXR5VG9TeXN0ZW1Db25zb2xl ID0gZmFsc2U7CisKKyAgICAgICAgLy8gQmVzdCB1c2VkIGluIGNvbWJpbmF0aW9uIHdpdGggZHVt cEFjdGl2aXR5VG9TeXN0ZW1Db25zb2xlLgorICAgICAgICBJbnNwZWN0b3JQcm90b2NvbC5kdW1w SW5zcGVjdG9yUHJvdG9jb2xNZXNzYWdlcyA9IGZhbHNlOwogICAgIDwvc2NyaXB0PgogPC9oZWFk PgogPC9odG1sPgo=