99150 2012-10-12 01:13:44 -0700 [BlackBerry] Dump DRT output to stdout if test is passed as command line argument 2012-10-18 09:19:18 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Other Other RESOLVED FIXED P2 Normal --- 0 xiaobwang webkit-unassigned mifenton mxie rwlbuis tonikitoo webkit.review.bot oldest_to_newest 740709 0 xiaobwang 2012-10-12 01:13:44 -0700 As we discussed earlier, we would like to have an easy way to generate DRT output for specific test case. Now that DRT has its own launcher, we can pass the test case name as the argument for drt-launcher. RIM PR #222624 740731 1 168379 xiaobwang 2012-10-12 01:50:34 -0700 Created attachment 168379 patch 740907 2 168379 rwlbuis 2012-10-12 07:40:28 -0700 Comment on attachment 168379 patch View in context: https://bugs.webkit.org/attachment.cgi?id=168379&action=review > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:339 > + if (testFile) { You can combine the above two lines. 741683 3 168614 xiaobwang 2012-10-14 19:38:21 -0700 Created attachment 168614 patch combined 2 lines into 1. 744464 4 168614 rwlbuis 2012-10-17 11:40:48 -0700 Comment on attachment 168614 patch View in context: https://bugs.webkit.org/attachment.cgi?id=168614&action=review Patch is ok, but runFromCommandLine functionality should be put into a function. > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:224 > + if (runFromCommandLine) { I talked with Ming and we think it is nicer if this is a method instead, which does the getenv internally. 745136 5 xiaobwang 2012-10-18 03:41:15 -0700 (In reply to comment #4) > (From update of attachment 168614 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=168614&action=review > > Patch is ok, but runFromCommandLine functionality should be put into a function. > > > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:224 > > + if (runFromCommandLine) { > > I talked with Ming and we think it is nicer if this is a method instead, which does the getenv internally. It's a little bit complicated to create a new function in DumpRenderTree for runFromCommandLine and call it from main.cpp directly. We need to go through libwebview and several places in webkit to call into DumpRenderTree.cpp. The setenv/getenv solution is much easier. The environment variable drtTestFile has two meanings: 1 - the test to run; 2 - it indicates the test is being run from commandline and we should dump text to stdout instead of redirecting to the dump file. I talked with Ming about this today, and he agreed with me. 745310 6 rwlbuis 2012-10-18 09:09:46 -0700 (In reply to comment #5) > (In reply to comment #4) > > (From update of attachment 168614 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=168614&action=review > > > > Patch is ok, but runFromCommandLine functionality should be put into a function. > > > > > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:224 > > > + if (runFromCommandLine) { > > > > I talked with Ming and we think it is nicer if this is a method instead, which does the getenv internally. > > It's a little bit complicated to create a new function in DumpRenderTree for runFromCommandLine and call it from main.cpp directly. We need to go through libwebview and several places in webkit to call into DumpRenderTree.cpp. The setenv/getenv solution is much easier. The environment variable drtTestFile has two meanings: 1 - the test to run; 2 - it indicates the test is being run from commandline and we should dump text to stdout instead of redirecting to the dump file. > I talked with Ming about this today, and he agreed with me. You are right, the patch is fine as it is. 745312 7 168614 rwlbuis 2012-10-18 09:10:04 -0700 Comment on attachment 168614 patch LGTM. 745318 8 168614 webkit.review.bot 2012-10-18 09:19:14 -0700 Comment on attachment 168614 patch Clearing flags on attachment: 168614 Committed r131761: <http://trac.webkit.org/changeset/131761> 745319 9 webkit.review.bot 2012-10-18 09:19:18 -0700 All reviewed patches have been landed. Closing bug. 168379 2012-10-12 01:50:34 -0700 2012-10-14 19:38:21 -0700 patch 0001-BlackBerry-Dump-DRT-output-to-stdout-if-test-is-pass.patch text/plain 8000 xiaobwang RnJvbSA2NWFhOGEyNjU2MzJiMzZiNjlhNzViNjFiNTQ4ZTFlMGY3YTM1YTlhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYaWFvYm8gV2FuZyA8eGJ3YW5nQHRvcmNobW9iaWxlLmNvbS5j bj4KRGF0ZTogRnJpLCAxMiBPY3QgMjAxMiAxNjo0NzozMSArMDgwMApTdWJqZWN0OiBbUEFUQ0hd IFtCbGFja0JlcnJ5XSBEdW1wIERSVCBvdXRwdXQgdG8gc3Rkb3V0IGlmIHRlc3QgaXMgcGFzc2Vk IGFzCiBjb21tYW5kIGxpbmUgYXJndW1lbnQKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05OTE1MAoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpGaXhlZCBzb21l IGNvZGUgc3R5bGUgZXJyb3JzIGFzIHdlbGwuCgoqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkv RHVtcFJlbmRlclRyZWUuY3BwOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6 cnVuVGVzdCk6CihCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpydW5SZW1haW5p bmdUZXN0cyk6CihCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpydW5UZXN0cyk6 CihCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjppc0hUVFBUZXN0KToKKEJsYWNr QmVycnk6OldlYktpdDo6RHVtcFJlbmRlclRyZWU6OmR1bXApOgooQmxhY2tCZXJyeTo6V2ViS2l0 OjpEdW1wUmVuZGVyVHJlZTo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CiogRHVtcFJlbmRlclRyZWUv YmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZUJsYWNrQmVycnkuaDoKKER1bXBSZW5kZXJUcmVlKToK LS0tCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8 ICAgMTkgKysrKysrKwogVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVy VHJlZS5jcHAgfCAgIDUyICsrKysrKysrKysrKy0tLS0tLS0KIC4uLi9ibGFja2JlcnJ5L0R1bXBS ZW5kZXJUcmVlQmxhY2tCZXJyeS5oICAgICAgICAgIHwgICAgMiArLQogMyBmaWxlcyBjaGFuZ2Vk LCA1MyBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWEzZGJjNS4uMWMzZDdmNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEyLTEwLTEyICBYaWFvYm8gV2FuZyAgPHhid2FuZ0B0b3JjaG1vYmlsZS5jb20uY24+ CisKKyAgICAgICAgW0JsYWNrQmVycnldIER1bXAgRFJUIG91dHB1dCB0byBzdGRvdXQgaWYgdGVz dCBpcyBwYXNzZWQgYXMgY29tbWFuZCBsaW5lIGFyZ3VtZW50CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTE1MAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIHNvbWUgY29kZSBzdHlsZSBlcnJvcnMg YXMgd2VsbC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRl clRyZWUuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6 cnVuVGVzdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpy dW5SZW1haW5pbmdUZXN0cyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5k ZXJUcmVlOjpydW5UZXN0cyk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5k ZXJUcmVlOjppc0hUVFBUZXN0KToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RHVtcFJl bmRlclRyZWU6OmR1bXApOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVy VHJlZTo6YWRkTWVzc2FnZVRvQ29uc29sZSk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvYmxh Y2tiZXJyeS9EdW1wUmVuZGVyVHJlZUJsYWNrQmVycnkuaDoKKyAgICAgICAgKER1bXBSZW5kZXJU cmVlKToKKwogMjAxMi0xMC0xMiAgSWx5YSBUaWtob25vdnNreSAgPGxvaXNsb0BjaHJvbWl1bS5v cmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBjb21waWxlIGVycm9yIGZpeCBmb3IgY2hyb21pdW0g d2luZG93cyBib3QuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5 L0R1bXBSZW5kZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVt cFJlbmRlclRyZWUuY3BwCmluZGV4IGZhNTdjNDYuLmUzYzA2OGEgMTAwNjQ0Ci0tLSBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWUuY3BwCkBAIC03Nyw2ICs3 Nyw3IEBAIFJlZlB0cjxUZXN0UnVubmVyPiBnVGVzdFJ1bm5lcjsKIFdlYkNvcmU6OkZyYW1lKiBt YWluRnJhbWUgPSAwOwogV2ViQ29yZTo6RnJhbWUqIHRvcExvYWRpbmdGcmFtZSA9IDA7CiBib29s IHdhaXRGb3JQb2xpY3kgPSBmYWxzZTsKK2Jvb2wgcnVuRnJvbUNvbW1hbmRMaW5lID0gZmFsc2U7 CiAKIC8vIEZJWE1FOiBBc3N1bWluZyBMYXlvdXRUZXN0cyBoYXMgYmVlbiBjb3BpZWQgdG8gL2Rl dmVsb3Blci9MYXlvdXRUZXN0cy8KIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBrU0RDTGF5b3V0 VGVzdHNVUkkgPSAiZmlsZTovLy9kZXZlbG9wZXIvTGF5b3V0VGVzdHMvIjsKQEAgLTE3NiwyMCAr MTc3LDIxIEBAIER1bXBSZW5kZXJUcmVlOjp+RHVtcFJlbmRlclRyZWUoKQogCiB2b2lkIER1bXBS ZW5kZXJUcmVlOjpydW5UZXN0KGNvbnN0IFN0cmluZyYgdXJsKQogewotICAgIGNyZWF0ZUZpbGUo bV9yZXN1bHRzRGlyICsgKm1fY3VycmVudFRlc3QgKyAiLmR1bXAuY3Jhc2giKTsKLQogICAgIG1h aW5GcmFtZS0+bG9hZGVyKCktPnN0b3BGb3JVc2VyQ2FuY2VsKCk7CiAgICAgcmVzZXRUb0NvbnNp c3RlbnRTdGF0ZUJlZm9yZVRlc3RpbmcoKTsKICAgICBpZiAoc2hvdWxkTG9nRnJhbWVMb2FkRGVs ZWdhdGVzKHVybCkpCiAgICAgICAgIGdUZXN0UnVubmVyLT5zZXREdW1wRnJhbWVMb2FkQ2FsbGJh Y2tzKHRydWUpOwotICAgIFN0cmluZyBzdGRvdXRGaWxlID0gbV9yZXN1bHRzRGlyICsgKm1fY3Vy cmVudFRlc3QgKyAiLmR1bXAiOwotICAgIFN0cmluZyBzdGRlcnJGaWxlID0gbV9yZXN1bHRzRGly ICsgKm1fY3VycmVudFRlc3QgKyAiLnN0ZGVyciI7CisgICAgaWYgKCFydW5Gcm9tQ29tbWFuZExp bmUpIHsKKyAgICAgICAgY3JlYXRlRmlsZShtX3Jlc3VsdHNEaXIgKyAqbV9jdXJyZW50VGVzdCAr ICIuZHVtcC5jcmFzaCIpOwogCi0gICAgLy8gRklYTUU6IHdlIHNob3VsZCBwcmVzZXJ2ZSB0aGUg b3JpZ2luYWwgc3Rkb3V0IGFuZCBzdGRlcnIgaGVyZSBidXQgYXJlbid0IGRvaW5nCi0gICAgLy8g dGhhdCB5ZXQgZHVlIHRvIGlzc3VlcyB3aXRoIGR1cCwgZXRjLgotICAgIGZyZW9wZW4oc3Rkb3V0 RmlsZS51dGY4KCkuZGF0YSgpLCAid2IiLCBzdGRvdXQpOwotICAgIGZyZW9wZW4oc3RkZXJyRmls ZS51dGY4KCkuZGF0YSgpLCAid2IiLCBzdGRlcnIpOworICAgICAgICBTdHJpbmcgc3Rkb3V0Rmls ZSA9IG1fcmVzdWx0c0RpciArICptX2N1cnJlbnRUZXN0ICsgIi5kdW1wIjsKKyAgICAgICAgU3Ry aW5nIHN0ZGVyckZpbGUgPSBtX3Jlc3VsdHNEaXIgKyAqbV9jdXJyZW50VGVzdCArICIuc3RkZXJy IjsKIAorICAgICAgICAvLyBGSVhNRTogd2Ugc2hvdWxkIHByZXNlcnZlIHRoZSBvcmlnaW5hbCBz dGRvdXQgYW5kIHN0ZGVyciBoZXJlIGJ1dCBhcmVuJ3QgZG9pbmcKKyAgICAgICAgLy8gdGhhdCB5 ZXQgZHVlIHRvIGlzc3VlcyB3aXRoIGR1cCwgZXRjLgorICAgICAgICBmcmVvcGVuKHN0ZG91dEZp bGUudXRmOCgpLmRhdGEoKSwgIndiIiwgc3Rkb3V0KTsKKyAgICAgICAgZnJlb3BlbihzdGRlcnJG aWxlLnV0ZjgoKS5kYXRhKCksICJ3YiIsIHN0ZGVycik7CisgICAgfQogICAgIEZJTEUqIGN1cnJl bnQgPSBmb3BlbihtX2N1cnJlbnRUZXN0RmlsZS51dGY4KCkuZGF0YSgpLCAidyIpOwogICAgIGZ3 cml0ZShtX2N1cnJlbnRUZXN0LT51dGY4KCkuZGF0YSgpLCAxLCBtX2N1cnJlbnRUZXN0LT51dGY4 KCkubGVuZ3RoKCksIGN1cnJlbnQpOwogICAgIGZjbG9zZShjdXJyZW50KTsKQEAgLTIxOSw2ICsy MjEsMTEgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6cnVuQ3VycmVudFRlc3QoKQogCiB2b2lkIER1 bXBSZW5kZXJUcmVlOjpydW5SZW1haW5pbmdUZXN0cygpCiB7CisgICAgaWYgKHJ1bkZyb21Db21t YW5kTGluZSkgeworICAgICAgICBkb25lRHJ0KCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK ICAgICAvLyBGSVhNRTogZmZsdXNoIHNob3VsZCBub3QgYmUgbmVjZXNzYXJ5IGJ1dCBpcyB0ZW1w b3JhcmlseSByZXF1aXJlZCBkdWUgdG8gYSBidWcgaW4gc3RkaW8gb3V0cHV0LgogICAgIGZmbHVz aChzdGRvdXQpOwogICAgIGZmbHVzaChzdGRlcnIpOwpAQCAtMzI4LDkgKzMzNSwxNSBAQCB2b2lk IER1bXBSZW5kZXJUcmVlOjpydW5UZXN0cygpCiAKICAgICBtYWluRnJhbWUgPSBEdW1wUmVuZGVy VHJlZVN1cHBvcnQ6OmNvcmVQYWdlKG1fcGFnZSktPm1haW5GcmFtZSgpOwogCi0gICAgLy8gR2V0 IFRlc3QgZmlsZSBuYW1lIGZyb20gUFBTOiAvcHBzL3NlcnZpY2VzL2RydC9pbnB1dAotICAgIC8v IEV4YW1wbGU6IHRlc3RfZmlsZTo6ZmFzdC9qcy9hcmd1bWVudHMuaHRtbAotICAgIHdhaXRGb3JU ZXN0KCk7CisgICAgY2hhciogdGVzdEZpbGUgPSBnZXRlbnYoImRydFRlc3RGaWxlIik7CisgICAg aWYgKHRlc3RGaWxlKSB7CisgICAgICAgIHJ1bkZyb21Db21tYW5kTGluZSA9IHRydWU7CisgICAg ICAgIGFkZFRlc3QodGVzdEZpbGUpOworICAgIH0gZWxzZSB7CisgICAgICAgIC8vIEdldCBUZXN0 IGZpbGUgbmFtZSBmcm9tIFBQUzogL3Bwcy9zZXJ2aWNlcy9kcnQvaW5wdXQKKyAgICAgICAgLy8g RXhhbXBsZTogdGVzdF9maWxlOjpmYXN0L2pzL2FyZ3VtZW50cy5odG1sCisgICAgICAgIHdhaXRG b3JUZXN0KCk7CisgICAgfQogfQogCiB2b2lkIER1bXBSZW5kZXJUcmVlOjphZGRUZXN0KGNvbnN0 IGNoYXIqIHRlc3RGaWxlKQpAQCAtMzgxLDcgKzM5NCw3IEBAIGJvb2wgRHVtcFJlbmRlclRyZWU6 OmlzSFRUUFRlc3QoY29uc3QgU3RyaW5nJiB0ZXN0KQogICAgIFN0cmluZyB0ZXN0TG93ZXIgPSB0 ZXN0Lmxvd2VyKCk7CiAgICAgaW50IGxlbkh0dHBUZXN0U3ludGF4ID0gc3RybGVuKGh0dHBUZXN0 U3ludGF4KTsKICAgICByZXR1cm4gdGVzdExvd2VyLnN1YnN0cmluZygwLCBsZW5IdHRwVGVzdFN5 bnRheCkgPT0gaHR0cFRlc3RTeW50YXgKLSAgICAgICAgICAgICYmIHRlc3RMb3dlci5zdWJzdHJp bmcobGVuSHR0cFRlc3RTeW50YXgsIHN0cmxlbihsb2NhbFRlc3RTeW50YXgpKSAhPSBsb2NhbFRl c3RTeW50YXg7CisgICAgICAgICYmIHRlc3RMb3dlci5zdWJzdHJpbmcobGVuSHR0cFRlc3RTeW50 YXgsIHN0cmxlbihsb2NhbFRlc3RTeW50YXgpKSAhPSBsb2NhbFRlc3RTeW50YXg7CiB9CiAKIHZv aWQgRHVtcFJlbmRlclRyZWU6OmludmFsaWRhdGVBbnlQcmV2aW91c1dhaXRUb0R1bXBXYXRjaGRv ZygpCkBAIC01MDAsMTIgKzUxMywxMyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlOjpkdW1wKCkKICAg ICBpZiAobV9kdW1wUGl4ZWxzICYmICFkdW1wQXNUZXh0ICYmIGdUZXN0UnVubmVyLT5nZW5lcmF0 ZVBpeGVsUmVzdWx0cygpKQogICAgICAgICBkdW1wV2ViVmlld0FzUGl4ZWxzQW5kQ29tcGFyZVdp dGhFeHBlY3RlZChnVGVzdFJ1bm5lci0+ZXhwZWN0ZWRQaXhlbEhhc2goKSk7CiAKLSAgICBTdHJp bmcgY3Jhc2hGaWxlID0gZHVtcEZpbGUgKyAiLmNyYXNoIjsKLSAgICB1bmxpbmsoY3Jhc2hGaWxl LnV0ZjgoKS5kYXRhKCkpOwotCi0gICAgU3RyaW5nIGRvbmVGaWxlID0gIG1fcmVzdWx0c0RpciAr ICptX2N1cnJlbnRUZXN0ICsgIi5kb25lIjsKLSAgICBjcmVhdGVGaWxlKGRvbmVGaWxlKTsKKyAg ICBpZiAoIXJ1bkZyb21Db21tYW5kTGluZSkgeworICAgICAgICBTdHJpbmcgY3Jhc2hGaWxlID0g ZHVtcEZpbGUgKyAiLmNyYXNoIjsKKyAgICAgICAgdW5saW5rKGNyYXNoRmlsZS51dGY4KCkuZGF0 YSgpKTsKIAorICAgICAgICBTdHJpbmcgZG9uZUZpbGUgPSAgbV9yZXN1bHRzRGlyICsgKm1fY3Vy cmVudFRlc3QgKyAiLmRvbmUiOworICAgICAgICBjcmVhdGVGaWxlKGRvbmVGaWxlKTsKKyAgICB9 CiAgICAgdGVzdERvbmUgPSB0cnVlOwogICAgIHJ1blJlbWFpbmluZ1Rlc3RzKCk7CiB9CkBAIC02 NDEsNyArNjU1LDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6ZGlkUmVjZWl2ZVRpdGxlRm9yRnJh bWUoY29uc3QgU3RyaW5nJiB0aXRsZSwgV2ViQ29yZTo6RnJhbWUKIH0KIAogLy8gQ2hyb21lQ2xp ZW50IGRlbGVnYXRlcy4KLXZvaWQgRHVtcFJlbmRlclRyZWU6OmFkZE1lc3NhZ2VUb0NvbnNvbGUo Y29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1bnNpZ25lZCBpbnQgbGluZU51bWJlciwgY29uc3QgU3Ry aW5nJiBzb3VyY2VJRCkKK3ZvaWQgRHVtcFJlbmRlclRyZWU6OmFkZE1lc3NhZ2VUb0NvbnNvbGUo Y29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcm IHNvdXJjZUlEKQogewogICAgIHByaW50ZigiQ09OU09MRSBNRVNTQUdFOiAiKTsKICAgICBpZiAo bGluZU51bWJlcikKQEAgLTY1Myw3ICs2NjcsNyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlOjphZGRN ZXNzYWdlVG9Db25zb2xlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdW5zaWduZWQgaW50IGxpbgog ICAgICAgICBTdHJpbmcgcmVtYWluaW5nID0gbWVzc2FnZS5zdWJzdHJpbmcocG9zKTsKICAgICAg ICAgU3RyaW5nIGZpbGVOYW1lOwogICAgICAgICBpbnQgaW5kZXhGaWxlID0gcmVtYWluaW5nLnJl dmVyc2VGaW5kKCcvJykgKyAxOwotICAgICAgICBpZiAoaW5kZXhGaWxlID4gMCAmJiBpbmRleEZp bGUgPCByZW1haW5pbmcubGVuZ3RoKCkpCisgICAgICAgIGlmIChpbmRleEZpbGUgPiAwICYmIHVu c2lnbmVkKGluZGV4RmlsZSkgPCByZW1haW5pbmcubGVuZ3RoKCkpCiAgICAgICAgICAgICBmaWxl TmFtZSA9IHJlbWFpbmluZy5zdWJzdHJpbmcoaW5kZXhGaWxlKTsKICAgICAgICAgZWxzZQogICAg ICAgICAgICAgZmlsZU5hbWUgPSAiZmlsZToiOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRl clRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZUJsYWNrQmVycnkuaCBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWVCbGFja0JlcnJ5LmgKaW5kZXggNGNh OWEzZi4uZGZjZjdjOCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJy eS9EdW1wUmVuZGVyVHJlZUJsYWNrQmVycnkuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9i bGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlQmxhY2tCZXJyeS5oCkBAIC03Nyw3ICs3Nyw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIGRpZFJlY2VpdmVSZXNwb25zZUZvckZyYW1lKFdlYkNvcmU6OkZyYW1l KiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYpOwogCiAgICAgLy8gQ2hyb21lQ2xp ZW50IGRlbGVnYXRlcwotICAgIHZvaWQgYWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBTdHJpbmcm IG1lc3NhZ2UsIHVuc2lnbmVkIGludCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlE KTsKKyAgICB2b2lkIGFkZE1lc3NhZ2VUb0NvbnNvbGUoY29uc3QgU3RyaW5nJiBtZXNzYWdlLCB1 bnNpZ25lZCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlEKTsKICAgICB2b2lkIHJ1 bkphdmFTY3JpcHRBbGVydChjb25zdCBTdHJpbmcmIG1lc3NhZ2UpOwogICAgIGJvb2wgcnVuSmF2 YVNjcmlwdENvbmZpcm0oY29uc3QgU3RyaW5nJiBtZXNzYWdlKTsKICAgICBTdHJpbmcgcnVuSmF2 YVNjcmlwdFByb21wdChjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFN0cmluZyYgZGVmYXVs dFZhbHVlKTsKLS0gCjEuNy42Cgo= 168614 2012-10-14 19:38:21 -0700 2012-10-18 09:19:14 -0700 patch 0001-BlackBerry-Dump-DRT-output-to-stdout-if-test-is-pass.patch text/plain 7972 xiaobwang RnJvbSAwZjY2YzRmMWJhZGFjMDE4YzA3OTYwYjQ2ZjAyMmI1MDVhMTg1NGZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYaWFvYm8gV2FuZyA8eGJ3YW5nQHRvcmNobW9iaWxlLmNvbS5j bj4KRGF0ZTogRnJpLCAxMiBPY3QgMjAxMiAxNjo0NzozMSArMDgwMApTdWJqZWN0OiBbUEFUQ0gg MS8yXSBbQmxhY2tCZXJyeV0gRHVtcCBEUlQgb3V0cHV0IHRvIHN0ZG91dCBpZiB0ZXN0IGlzIHBh c3NlZAogYXMgY29tbWFuZCBsaW5lIGFyZ3VtZW50CiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9OTkxNTAKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKRml4ZWQg c29tZSBjb2RlIHN0eWxlIGVycm9ycyBhcyB3ZWxsLgoKKiBEdW1wUmVuZGVyVHJlZS9ibGFja2Jl cnJ5L0R1bXBSZW5kZXJUcmVlLmNwcDoKKEJsYWNrQmVycnk6OldlYktpdDo6RHVtcFJlbmRlclRy ZWU6OnJ1blRlc3QpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6cnVuUmVt YWluaW5nVGVzdHMpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6cnVuVGVz dHMpOgooQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6aXNIVFRQVGVzdCk6CihC bGFja0JlcnJ5OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjpkdW1wKToKKEJsYWNrQmVycnk6Oldl YktpdDo6RHVtcFJlbmRlclRyZWU6OmFkZE1lc3NhZ2VUb0NvbnNvbGUpOgoqIER1bXBSZW5kZXJU cmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWVCbGFja0JlcnJ5Lmg6CihEdW1wUmVuZGVyVHJl ZSk6Ci0tLQogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgfCAgIDE5ICsrKysrKysKIFRvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJl bmRlclRyZWUuY3BwIHwgICA1MSArKysrKysrKysrKystLS0tLS0tCiAuLi4vYmxhY2tiZXJyeS9E dW1wUmVuZGVyVHJlZUJsYWNrQmVycnkuaCAgICAgICAgICB8ICAgIDIgKy0KIDMgZmlsZXMgY2hh bmdlZCwgNTIgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvVG9v bHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDlhM2RiYzUuLjFjM2Q3ZjUgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwyMiBAQAorMjAxMi0xMC0xMiAgWGlhb2JvIFdhbmcgIDx4YndhbmdAdG9yY2htb2JpbGUuY29t LmNuPgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBEdW1wIERSVCBvdXRwdXQgdG8gc3Rkb3V0IGlm IHRlc3QgaXMgcGFzc2VkIGFzIGNvbW1hbmQgbGluZSBhcmd1bWVudAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTkxNTAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXhlZCBzb21lIGNvZGUgc3R5bGUgZXJy b3JzIGFzIHdlbGwuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0R1bXBS ZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RHVtcFJlbmRlclRy ZWU6OnJ1blRlc3QpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJl ZTo6cnVuUmVtYWluaW5nVGVzdHMpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1w UmVuZGVyVHJlZTo6cnVuVGVzdHMpOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1w UmVuZGVyVHJlZTo6aXNIVFRQVGVzdCk6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OkR1 bXBSZW5kZXJUcmVlOjpkdW1wKToKKyAgICAgICAgKEJsYWNrQmVycnk6OldlYktpdDo6RHVtcFJl bmRlclRyZWU6OmFkZE1lc3NhZ2VUb0NvbnNvbGUpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVl L2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWVCbGFja0JlcnJ5Lmg6CisgICAgICAgIChEdW1wUmVu ZGVyVHJlZSk6CisKIDIwMTItMTAtMTIgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgY29tcGlsZSBlcnJvciBmaXggZm9yIGNocm9t aXVtIHdpbmRvd3MgYm90LgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2ti ZXJyeS9EdW1wUmVuZGVyVHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5 L0R1bXBSZW5kZXJUcmVlLmNwcAppbmRleCBmYTU3YzQ2Li44MGIwNGYwIDEwMDY0NAotLS0gYS9U b29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9U b29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNzcs NiArNzcsNyBAQCBSZWZQdHI8VGVzdFJ1bm5lcj4gZ1Rlc3RSdW5uZXI7CiBXZWJDb3JlOjpGcmFt ZSogbWFpbkZyYW1lID0gMDsKIFdlYkNvcmU6OkZyYW1lKiB0b3BMb2FkaW5nRnJhbWUgPSAwOwog Ym9vbCB3YWl0Rm9yUG9saWN5ID0gZmFsc2U7Citib29sIHJ1bkZyb21Db21tYW5kTGluZSA9IGZh bHNlOwogCiAvLyBGSVhNRTogQXNzdW1pbmcgTGF5b3V0VGVzdHMgaGFzIGJlZW4gY29waWVkIHRv IC9kZXZlbG9wZXIvTGF5b3V0VGVzdHMvCiBzdGF0aWMgY29uc3QgY2hhciogY29uc3Qga1NEQ0xh eW91dFRlc3RzVVJJID0gImZpbGU6Ly8vZGV2ZWxvcGVyL0xheW91dFRlc3RzLyI7CkBAIC0xNzYs MjAgKzE3NywyMSBAQCBEdW1wUmVuZGVyVHJlZTo6fkR1bXBSZW5kZXJUcmVlKCkKIAogdm9pZCBE dW1wUmVuZGVyVHJlZTo6cnVuVGVzdChjb25zdCBTdHJpbmcmIHVybCkKIHsKLSAgICBjcmVhdGVG aWxlKG1fcmVzdWx0c0RpciArICptX2N1cnJlbnRUZXN0ICsgIi5kdW1wLmNyYXNoIik7Ci0KICAg ICBtYWluRnJhbWUtPmxvYWRlcigpLT5zdG9wRm9yVXNlckNhbmNlbCgpOwogICAgIHJlc2V0VG9D b25zaXN0ZW50U3RhdGVCZWZvcmVUZXN0aW5nKCk7CiAgICAgaWYgKHNob3VsZExvZ0ZyYW1lTG9h ZERlbGVnYXRlcyh1cmwpKQogICAgICAgICBnVGVzdFJ1bm5lci0+c2V0RHVtcEZyYW1lTG9hZENh bGxiYWNrcyh0cnVlKTsKLSAgICBTdHJpbmcgc3Rkb3V0RmlsZSA9IG1fcmVzdWx0c0RpciArICpt X2N1cnJlbnRUZXN0ICsgIi5kdW1wIjsKLSAgICBTdHJpbmcgc3RkZXJyRmlsZSA9IG1fcmVzdWx0 c0RpciArICptX2N1cnJlbnRUZXN0ICsgIi5zdGRlcnIiOworICAgIGlmICghcnVuRnJvbUNvbW1h bmRMaW5lKSB7CisgICAgICAgIGNyZWF0ZUZpbGUobV9yZXN1bHRzRGlyICsgKm1fY3VycmVudFRl c3QgKyAiLmR1bXAuY3Jhc2giKTsKIAotICAgIC8vIEZJWE1FOiB3ZSBzaG91bGQgcHJlc2VydmUg dGhlIG9yaWdpbmFsIHN0ZG91dCBhbmQgc3RkZXJyIGhlcmUgYnV0IGFyZW4ndCBkb2luZwotICAg IC8vIHRoYXQgeWV0IGR1ZSB0byBpc3N1ZXMgd2l0aCBkdXAsIGV0Yy4KLSAgICBmcmVvcGVuKHN0 ZG91dEZpbGUudXRmOCgpLmRhdGEoKSwgIndiIiwgc3Rkb3V0KTsKLSAgICBmcmVvcGVuKHN0ZGVy ckZpbGUudXRmOCgpLmRhdGEoKSwgIndiIiwgc3RkZXJyKTsKKyAgICAgICAgU3RyaW5nIHN0ZG91 dEZpbGUgPSBtX3Jlc3VsdHNEaXIgKyAqbV9jdXJyZW50VGVzdCArICIuZHVtcCI7CisgICAgICAg IFN0cmluZyBzdGRlcnJGaWxlID0gbV9yZXN1bHRzRGlyICsgKm1fY3VycmVudFRlc3QgKyAiLnN0 ZGVyciI7CiAKKyAgICAgICAgLy8gRklYTUU6IHdlIHNob3VsZCBwcmVzZXJ2ZSB0aGUgb3JpZ2lu YWwgc3Rkb3V0IGFuZCBzdGRlcnIgaGVyZSBidXQgYXJlbid0IGRvaW5nCisgICAgICAgIC8vIHRo YXQgeWV0IGR1ZSB0byBpc3N1ZXMgd2l0aCBkdXAsIGV0Yy4KKyAgICAgICAgZnJlb3BlbihzdGRv dXRGaWxlLnV0ZjgoKS5kYXRhKCksICJ3YiIsIHN0ZG91dCk7CisgICAgICAgIGZyZW9wZW4oc3Rk ZXJyRmlsZS51dGY4KCkuZGF0YSgpLCAid2IiLCBzdGRlcnIpOworICAgIH0KICAgICBGSUxFKiBj dXJyZW50ID0gZm9wZW4obV9jdXJyZW50VGVzdEZpbGUudXRmOCgpLmRhdGEoKSwgInciKTsKICAg ICBmd3JpdGUobV9jdXJyZW50VGVzdC0+dXRmOCgpLmRhdGEoKSwgMSwgbV9jdXJyZW50VGVzdC0+ dXRmOCgpLmxlbmd0aCgpLCBjdXJyZW50KTsKICAgICBmY2xvc2UoY3VycmVudCk7CkBAIC0yMTks NiArMjIxLDExIEBAIHZvaWQgRHVtcFJlbmRlclRyZWU6OnJ1bkN1cnJlbnRUZXN0KCkKIAogdm9p ZCBEdW1wUmVuZGVyVHJlZTo6cnVuUmVtYWluaW5nVGVzdHMoKQogeworICAgIGlmIChydW5Gcm9t Q29tbWFuZExpbmUpIHsKKyAgICAgICAgZG9uZURydCgpOworICAgICAgICByZXR1cm47CisgICAg fQorCiAgICAgLy8gRklYTUU6IGZmbHVzaCBzaG91bGQgbm90IGJlIG5lY2Vzc2FyeSBidXQgaXMg dGVtcG9yYXJpbHkgcmVxdWlyZWQgZHVlIHRvIGEgYnVnIGluIHN0ZGlvIG91dHB1dC4KICAgICBm Zmx1c2goc3Rkb3V0KTsKICAgICBmZmx1c2goc3RkZXJyKTsKQEAgLTMyOCw5ICszMzUsMTQgQEAg dm9pZCBEdW1wUmVuZGVyVHJlZTo6cnVuVGVzdHMoKQogCiAgICAgbWFpbkZyYW1lID0gRHVtcFJl bmRlclRyZWVTdXBwb3J0Ojpjb3JlUGFnZShtX3BhZ2UpLT5tYWluRnJhbWUoKTsKIAotICAgIC8v IEdldCBUZXN0IGZpbGUgbmFtZSBmcm9tIFBQUzogL3Bwcy9zZXJ2aWNlcy9kcnQvaW5wdXQKLSAg ICAvLyBFeGFtcGxlOiB0ZXN0X2ZpbGU6OmZhc3QvanMvYXJndW1lbnRzLmh0bWwKLSAgICB3YWl0 Rm9yVGVzdCgpOworICAgIGlmIChnZXRlbnYoImRydFRlc3RGaWxlIikpIHsKKyAgICAgICAgcnVu RnJvbUNvbW1hbmRMaW5lID0gdHJ1ZTsKKyAgICAgICAgYWRkVGVzdCh0ZXN0RmlsZSk7CisgICAg fSBlbHNlIHsKKyAgICAgICAgLy8gR2V0IFRlc3QgZmlsZSBuYW1lIGZyb20gUFBTOiAvcHBzL3Nl cnZpY2VzL2RydC9pbnB1dAorICAgICAgICAvLyBFeGFtcGxlOiB0ZXN0X2ZpbGU6OmZhc3QvanMv YXJndW1lbnRzLmh0bWwKKyAgICAgICAgd2FpdEZvclRlc3QoKTsKKyAgICB9CiB9CiAKIHZvaWQg RHVtcFJlbmRlclRyZWU6OmFkZFRlc3QoY29uc3QgY2hhciogdGVzdEZpbGUpCkBAIC0zODEsNyAr MzkzLDcgQEAgYm9vbCBEdW1wUmVuZGVyVHJlZTo6aXNIVFRQVGVzdChjb25zdCBTdHJpbmcmIHRl c3QpCiAgICAgU3RyaW5nIHRlc3RMb3dlciA9IHRlc3QubG93ZXIoKTsKICAgICBpbnQgbGVuSHR0 cFRlc3RTeW50YXggPSBzdHJsZW4oaHR0cFRlc3RTeW50YXgpOwogICAgIHJldHVybiB0ZXN0TG93 ZXIuc3Vic3RyaW5nKDAsIGxlbkh0dHBUZXN0U3ludGF4KSA9PSBodHRwVGVzdFN5bnRheAotICAg ICAgICAgICAgJiYgdGVzdExvd2VyLnN1YnN0cmluZyhsZW5IdHRwVGVzdFN5bnRheCwgc3RybGVu KGxvY2FsVGVzdFN5bnRheCkpICE9IGxvY2FsVGVzdFN5bnRheDsKKyAgICAgICAgJiYgdGVzdExv d2VyLnN1YnN0cmluZyhsZW5IdHRwVGVzdFN5bnRheCwgc3RybGVuKGxvY2FsVGVzdFN5bnRheCkp ICE9IGxvY2FsVGVzdFN5bnRheDsKIH0KIAogdm9pZCBEdW1wUmVuZGVyVHJlZTo6aW52YWxpZGF0 ZUFueVByZXZpb3VzV2FpdFRvRHVtcFdhdGNoZG9nKCkKQEAgLTUwMCwxMiArNTEyLDEzIEBAIHZv aWQgRHVtcFJlbmRlclRyZWU6OmR1bXAoKQogICAgIGlmIChtX2R1bXBQaXhlbHMgJiYgIWR1bXBB c1RleHQgJiYgZ1Rlc3RSdW5uZXItPmdlbmVyYXRlUGl4ZWxSZXN1bHRzKCkpCiAgICAgICAgIGR1 bXBXZWJWaWV3QXNQaXhlbHNBbmRDb21wYXJlV2l0aEV4cGVjdGVkKGdUZXN0UnVubmVyLT5leHBl Y3RlZFBpeGVsSGFzaCgpKTsKIAotICAgIFN0cmluZyBjcmFzaEZpbGUgPSBkdW1wRmlsZSArICIu Y3Jhc2giOwotICAgIHVubGluayhjcmFzaEZpbGUudXRmOCgpLmRhdGEoKSk7Ci0KLSAgICBTdHJp bmcgZG9uZUZpbGUgPSAgbV9yZXN1bHRzRGlyICsgKm1fY3VycmVudFRlc3QgKyAiLmRvbmUiOwot ICAgIGNyZWF0ZUZpbGUoZG9uZUZpbGUpOworICAgIGlmICghcnVuRnJvbUNvbW1hbmRMaW5lKSB7 CisgICAgICAgIFN0cmluZyBjcmFzaEZpbGUgPSBkdW1wRmlsZSArICIuY3Jhc2giOworICAgICAg ICB1bmxpbmsoY3Jhc2hGaWxlLnV0ZjgoKS5kYXRhKCkpOwogCisgICAgICAgIFN0cmluZyBkb25l RmlsZSA9ICBtX3Jlc3VsdHNEaXIgKyAqbV9jdXJyZW50VGVzdCArICIuZG9uZSI7CisgICAgICAg IGNyZWF0ZUZpbGUoZG9uZUZpbGUpOworICAgIH0KICAgICB0ZXN0RG9uZSA9IHRydWU7CiAgICAg cnVuUmVtYWluaW5nVGVzdHMoKTsKIH0KQEAgLTY0MSw3ICs2NTQsNyBAQCB2b2lkIER1bXBSZW5k ZXJUcmVlOjpkaWRSZWNlaXZlVGl0bGVGb3JGcmFtZShjb25zdCBTdHJpbmcmIHRpdGxlLCBXZWJD b3JlOjpGcmFtZQogfQogCiAvLyBDaHJvbWVDbGllbnQgZGVsZWdhdGVzLgotdm9pZCBEdW1wUmVu ZGVyVHJlZTo6YWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2ln bmVkIGludCBsaW5lTnVtYmVyLCBjb25zdCBTdHJpbmcmIHNvdXJjZUlEKQordm9pZCBEdW1wUmVu ZGVyVHJlZTo6YWRkTWVzc2FnZVRvQ29uc29sZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2ln bmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlSUQpCiB7CiAgICAgcHJpbnRmKCJD T05TT0xFIE1FU1NBR0U6ICIpOwogICAgIGlmIChsaW5lTnVtYmVyKQpAQCAtNjUzLDcgKzY2Niw3 IEBAIHZvaWQgRHVtcFJlbmRlclRyZWU6OmFkZE1lc3NhZ2VUb0NvbnNvbGUoY29uc3QgU3RyaW5n JiBtZXNzYWdlLCB1bnNpZ25lZCBpbnQgbGluCiAgICAgICAgIFN0cmluZyByZW1haW5pbmcgPSBt ZXNzYWdlLnN1YnN0cmluZyhwb3MpOwogICAgICAgICBTdHJpbmcgZmlsZU5hbWU7CiAgICAgICAg IGludCBpbmRleEZpbGUgPSByZW1haW5pbmcucmV2ZXJzZUZpbmQoJy8nKSArIDE7Ci0gICAgICAg IGlmIChpbmRleEZpbGUgPiAwICYmIGluZGV4RmlsZSA8IHJlbWFpbmluZy5sZW5ndGgoKSkKKyAg ICAgICAgaWYgKGluZGV4RmlsZSA+IDAgJiYgdW5zaWduZWQoaW5kZXhGaWxlKSA8IHJlbWFpbmlu Zy5sZW5ndGgoKSkKICAgICAgICAgICAgIGZpbGVOYW1lID0gcmVtYWluaW5nLnN1YnN0cmluZyhp bmRleEZpbGUpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICBmaWxlTmFtZSA9ICJmaWxlOiI7 CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJU cmVlQmxhY2tCZXJyeS5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVu ZGVyVHJlZUJsYWNrQmVycnkuaAppbmRleCA0Y2E5YTNmLi5kZmNmN2M4IDEwMDY0NAotLS0gYS9U b29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlQmxhY2tCZXJyeS5o CisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWVCbGFj a0JlcnJ5LmgKQEAgLTc3LDcgKzc3LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlkUmVjZWl2ZVJl c3BvbnNlRm9yRnJhbWUoV2ViQ29yZTo6RnJhbWUqLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlJik7CiAKICAgICAvLyBDaHJvbWVDbGllbnQgZGVsZWdhdGVzCi0gICAgdm9pZCBhZGRN ZXNzYWdlVG9Db25zb2xlKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdW5zaWduZWQgaW50IGxpbmVO dW1iZXIsIGNvbnN0IFN0cmluZyYgc291cmNlSUQpOworICAgIHZvaWQgYWRkTWVzc2FnZVRvQ29u c29sZShjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVuc2lnbmVkIGxpbmVOdW1iZXIsIGNvbnN0IFN0 cmluZyYgc291cmNlSUQpOwogICAgIHZvaWQgcnVuSmF2YVNjcmlwdEFsZXJ0KGNvbnN0IFN0cmlu ZyYgbWVzc2FnZSk7CiAgICAgYm9vbCBydW5KYXZhU2NyaXB0Q29uZmlybShjb25zdCBTdHJpbmcm IG1lc3NhZ2UpOwogICAgIFN0cmluZyBydW5KYXZhU2NyaXB0UHJvbXB0KGNvbnN0IFN0cmluZyYg bWVzc2FnZSwgY29uc3QgU3RyaW5nJiBkZWZhdWx0VmFsdWUpOwotLSAKMS43LjYKCg==