43286 2010-07-30 16:31:22 -0700 Remove setNodeToDump from dump-as-markup.js 2010-08-02 17:32:00 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 1 rniwa rniwa abarth darin eric ojan webkit.review.bot oldest_to_newest 258463 0 rniwa 2010-07-30 16:31:22 -0700 Now that noAutoDump is added, setNodeToDump is redundant. We should make dump a little smarter not to print out the optional description, and remove setNodeToDump. 258509 1 63134 rniwa 2010-07-30 18:20:17 -0700 Created attachment 63134 Patch 258989 2 63134 ojan 2010-08-02 11:12:23 -0700 Comment on attachment 63134 Patch Just a few nits. > +++ LayoutTests/resources/dump-as-markup.js (working copy) > - // If dump is not called by notifyDone, then print out optional description > - // because this test is manually calling dump. > - if (!Markup._done || opt_description) { > + if (Markup._dumpCalls > 1 || opt_description) { > if (!opt_description) > opt_description = "Dump of markup " + Markup._dumpCalls > if (Markup._dumpCalls > 1) > - markup += '\n'; > + markup += '\n' Missing semi-colon. > markup += '\n' + opt_description + ':\n'; > + } else { > + Markup._firstCallDidNotHaveDescription = true; > } Single-line else statement should not use brackets. > + if (Markup._dumpCalls > 1 && Markup._firstCallDidNotHaveDescription) { > + Markup._container.insertBefore( > + document.createTextNode('\nDump of markup 1:\n'), > + Markup._container.firstChild.nextSibling); This looks to me like it will only work on tests that have descriptions, no? How about wrapping the first dump in a span with an ID? Then you can getElementById instead of relying on the DOM structure. Or you could give each dump a classname and get do getElementsByClassName(class)[0]. Relying on the DOM structure is too fragile I think. 259153 3 63271 rniwa 2010-08-02 15:41:24 -0700 Created attachment 63271 Fixed per Ojan's comment. Asked him to take a look again 259158 4 63271 ojan 2010-08-02 15:45:47 -0700 Comment on attachment 63271 Fixed per Ojan's comment. Asked him to take a look again > + if (Markup._dumpCalls == 2 && Markup._firstCallDidNotHaveDescription) { > + var wrapper = document.getElementById('dump-as-markup-1'); > + wrapper.insertBefore(document.createTextNode('\nDump of markup 1:\n'), wrapper.firstChild); > + } > - Markup._container.appendChild(document.createTextNode(markup)); > + if (Markup._test_description && Markup._dumpCalls == 1) > + Markup._container.appendChild(document.createTextNode(Markup._test_description + '\n')) > + > + var wrapper = document.createElement('span'); > + wrapper.setAttribute('id', 'dump-as-markup-' + Markup._dumpCalls); Nit: No need to use setAttribute with IDs. Can just do: wrapper.id = 'dump-as-markup-' + Markup._dumpCalls; Also, we could use classes instead of IDs. Then you can get the first one by calling document.getElementsByClassName(class)[0]. 259202 5 rniwa 2010-08-02 17:00:56 -0700 Committed r64507: <http://trac.webkit.org/changeset/64507> 259218 6 webkit.review.bot 2010-08-02 17:32:00 -0700 http://trac.webkit.org/changeset/64507 might have broken GTK Linux 64-bit Debug The following changes are on the blame list: http://trac.webkit.org/changeset/64506 http://trac.webkit.org/changeset/64507 63134 2010-07-30 18:20:17 -0700 2010-08-02 15:41:20 -0700 Patch bug-43286-20100730182016.patch text/plain 8902 rniwa SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY0MzkyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDctMzAgIFJ5b3N1a2UgTml3YSAgPHJu aXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmVtb3ZlIHNldE5vZGVUb0R1bXAgZnJvbSBkdW1wLWFzLW1hcmt1cC5qcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMyODYKKworICAg ICAgICBSZW1vdmVkIFJlbW92ZWQgTWFya3VwLnNldE5vZGVUb0R1bXAsIHJlcGxhY2VkIGFsbCBj YWxscyB0byB0aGlzIG1ldGhvZCBieSBjYWxscyB0byBkdW1wLgorICAgICAgICBCZWNhdXNlIHdl IHdhbnQgbmVlZCB0byBhdm9pZCBwcmludGluZyAiRHVtcCBvZiBtYXJrdXAgMToiIHdoZW4gZHVt cCBpcyBjYWxsZWQgb25seSBvbmNlLAorICAgICAgICBNYXJrdXAuZHVtcCBubyBsb25nZXIgYWRk cyB0aGUgdGV4dCBvbiB0aGUgZmlyc3QgY2FsbC4gSW5zdGVhZCwgaXQnbGwgaW5zZXJ0IHRoZSB0 ZXh0CisgICAgICAgIG9uIHRoZSBzZWNvbmQgY2FsbCB3aGVuIHRoZSBmaXJzdCBjYWxsIGRpZG4n dCBoYXZlIHRoZSBkZXNjcmlwdGlvbi4KKworICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQv Y3JlYXRlLWxpc3QtZnJvbS1yYW5nZS1zZWxlY3Rpb24uaHRtbDogUmVwbGFjZWQgc2V0Tm9kZVRv RHVtcCBieSBkdW1wCisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9oaWxpdGVjb2xvci5o dG1sOiBSZXBsYWNlZCBzZXROb2RlVG9EdW1wIGJ5IGR1bXAKKyAgICAgICAgKiBlZGl0aW5nL2V4 ZWNDb21tYW5kL2luc2VydC1saXN0LWVtcHR5LWRpdi5odG1sOiBSZXBsYWNlZCBzZXROb2RlVG9E dW1wIGJ5IGR1bXAKKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL3N3aXRjaC1saXN0LXR5 cGUtd2l0aC1pbm5lci1saXN0Lmh0bWw6IFJlcGxhY2VkIHNldE5vZGVUb0R1bXAgYnkgZHVtcAor ICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQvc3dpdGNoLWxpc3QtdHlwZS13aXRoLW9ycGhh bmVkLWxpLmh0bWw6IFJlcGxhY2VkIHNldE5vZGVUb0R1bXAgYnkgZHVtcAorICAgICAgICAqIGVk aXRpbmcvc2VsZWN0aW9uL2hvbWUtaW5zaWRlLW5vbmVkaXRhYmxlLXRhYmxlLmh0bWw6IFJlcGxh Y2VkIHNldE5vZGVUb0R1bXAgYnkgZHVtcAorICAgICAgICAqIGVkaXRpbmcvc3R5bGUvcmVtb3Zl LXVuZGVybGluZS1mcm9tLXN0eWxlc2hlZXQuaHRtbDogUmVwbGFjZWQgc2V0Tm9kZVRvRHVtcCBi eSBkdW1wCisgICAgICAgICogcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzOiBSZW1vdmVkIE1h cmt1cC5zZXROb2RlVG9EdW1wLgorICAgICAgICAoTWFya3VwLmR1bXApOgorICAgICAgICAoTWFy a3VwLm5vdGlmeURvbmUpOgorCiAyMDEwLTA3LTMwICBBbmRyZXcgV2lsc29uICA8YXR3aWxzb25A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgcm9sbGJhY2sgZm9yIHI2NDM3NSBi ZWNhdXNlIGl0IGJyb2tlIGNocm9taXVtIHRlc3RzCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5n L2V4ZWNDb21tYW5kL2NyZWF0ZS1saXN0LWZyb20tcmFuZ2Utc2VsZWN0aW9uLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9jcmVhdGUtbGlzdC1mcm9t LXJhbmdlLXNlbGVjdGlvbi5odG1sCShyZXZpc2lvbiA2NDM3NCkKKysrIExheW91dFRlc3RzL2Vk aXRpbmcvZXhlY0NvbW1hbmQvY3JlYXRlLWxpc3QtZnJvbS1yYW5nZS1zZWxlY3Rpb24uaHRtbAko d29ya2luZyBjb3B5KQpAQCAtNyw1ICs3LDUgQEAgdmFyIHN0YXJ0ID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInN0YQogdmFyIGVuZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJlbmQiKS5m aXJzdENoaWxkOwogcy5zZXRCYXNlQW5kRXh0ZW50KHN0YXJ0LCAyLCBlbmQsIDIpOwogZG9jdW1l bnQuZXhlY0NvbW1hbmQoIkluc2VydE9yZGVyZWRMaXN0IiwgZmFsc2UsICIiKTsKLU1hcmt1cC5z ZXROb2RlVG9EdW1wKCJ0ZXN0Iik7CitNYXJrdXAuZHVtcCgidGVzdCIpOwogPC9zY3JpcHQ+Cklu ZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2hpbGl0ZWNvbG9yLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9oaWxpdGVjb2xvci5o dG1sCShyZXZpc2lvbiA2NDM3NCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQv aGlsaXRlY29sb3IuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTQsNSArMTQsNSBAQCBzZWwubW9k aWZ5KCJleHRlbmQiLCAiYmFja3dhcmQiLCAid29yZCIpCiBkb2N1bWVudC5leGVjQ29tbWFuZCgi SGlsaXRlQ29sb3IiLCBmYWxzZSwgInJlZCIpOwogc2VsLm1vZGlmeSgibW92ZSIsICJiYWNrd2Fy ZCIsICJsaW5lIik7CiAKLU1hcmt1cC5zZXROb2RlVG9EdW1wKCd0ZXN0JykKK01hcmt1cC5kdW1w KCd0ZXN0JykKIDwvc2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9pbnNlcnQtbGlzdC1lbXB0eS1kaXYuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9l ZGl0aW5nL2V4ZWNDb21tYW5kL2luc2VydC1saXN0LWVtcHR5LWRpdi5odG1sCShyZXZpc2lvbiA2 NDM3NCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5zZXJ0LWxpc3QtZW1w dHktZGl2Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTgsNSArOCw1IEBAIHZhciBkaXYgPSBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiZGl2IikKIHNlbC5zZXRQb3NpdGlvbihkaXYsIDApOwogCiBk b2N1bWVudC5leGVjQ29tbWFuZCgiSW5zZXJ0VW5vcmRlcmVkTGlzdCIpOwotTWFya3VwLnNldE5v ZGVUb0R1bXAoImRpdiIpOworTWFya3VwLmR1bXAoImRpdiIpOwogPC9zY3JpcHQ+CkluZGV4OiBM YXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3N3aXRjaC1saXN0LXR5cGUtd2l0aC1pbm5l ci1saXN0Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9zd2l0Y2gtbGlzdC10eXBlLXdpdGgtaW5uZXItbGlzdC5odG1sCShyZXZpc2lvbiA2NDM3NCkK KysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvc3dpdGNoLWxpc3QtdHlwZS13aXRo LWlubmVyLWxpc3QuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTEsMTAgKzExLDExIEBACiA8L2Rp dj4KIDxzY3JpcHQ+CiBNYXJrdXAuZGVzY3JpcHRpb24oJ1RoaXMgdGVzdHMgc3dpdGNoaW5nIGFu IHVub3JkZXJlZCBsaXN0IHdpdGggYSBuZXN0ZWQgbGlzdCB0byBhbiBvcmRlcmVkIGxpc3QuJyk7 Ci1NYXJrdXAuc2V0Tm9kZVRvRHVtcCgndGVzdCcpOwogCiB2YXIgdGVzdCA9IGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCd0ZXN0Jyk7CiB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuc2VsZWN0QWxsQ2hp bGRyZW4odGVzdCk7CiBkb2N1bWVudC5leGVjQ29tbWFuZCgnSW5zZXJ0T3JkZXJlZExpc3QnLCBm YWxzZSwgbnVsbCk7CisKK01hcmt1cC5kdW1wKCd0ZXN0Jyk7CiA8L3NjcmlwdD4KIDwvYm9keT4K SW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvc3dpdGNoLWxpc3QtdHlwZS13 aXRoLW9ycGhhbmVkLWxpLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9l eGVjQ29tbWFuZC9zd2l0Y2gtbGlzdC10eXBlLXdpdGgtb3JwaGFuZWQtbGkuaHRtbAkocmV2aXNp b24gNjQzNzQpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3N3aXRjaC1saXN0 LXR5cGUtd2l0aC1vcnBoYW5lZC1saS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xNCwxMCArMTQs MTEgQEAKIDwvZGl2PgogPHNjcmlwdD4KIE1hcmt1cC5kZXNjcmlwdGlvbignVGhpcyB0ZXN0cyBz d2l0Y2hpbmcgbXVsdGlwbGUgbGlzdHMgd2l0aCBhbiBvcnBoYW5lZCBsaXN0IGNoaWxkIHRvIGFu IG9yZGVyZWQgbGlzdC4nKTsKLU1hcmt1cC5zZXROb2RlVG9EdW1wKCd0ZXN0Jyk7CiAKIHZhciB0 ZXN0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3QnKTsKIHdpbmRvdy5nZXRTZWxlY3Rp b24oKS5zZWxlY3RBbGxDaGlsZHJlbih0ZXN0KTsKIGRvY3VtZW50LmV4ZWNDb21tYW5kKCdJbnNl cnRPcmRlcmVkTGlzdCcsIGZhbHNlLCBudWxsKTsKKworTWFya3VwLmR1bXAoJ3Rlc3QnKTsKIDwv c2NyaXB0PgogPC9ib2R5PgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vaG9t ZS1pbnNpZGUtbm9uZWRpdGFibGUtdGFibGUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9lZGl0aW5nL3NlbGVjdGlvbi9ob21lLWluc2lkZS1ub25lZGl0YWJsZS10YWJsZS5odG1sCShy ZXZpc2lvbiA2NDM3NCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2hvbWUtaW5z aWRlLW5vbmVkaXRhYmxlLXRhYmxlLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTEyLDEyICsxMiwx MSBAQAogPHNjcmlwdD4KIAogTWFya3VwLmRlc2NyaXB0aW9uKCJUZXN0cyB3aGV0aGVyIGhvbWUg bW92ZXMgdGhlIGNhcmV0IHRvIHRoZSBiZWdpbm5pbmcgb2YgbGluZSBpbnNpZGUgYSBjb250ZW50 LWVkaXRhYmxlIGluIGFuIHVuZWRpdGFibGUgdGFibGUuIikKLU1hcmt1cC5zZXROb2RlVG9EdW1w KCd0ZXN0Jyk7CiAKIHZhciBzID0gd2luZG93LmdldFNlbGVjdGlvbigpOwogcy5zZXRQb3NpdGlv bihkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbDEnKS5maXJzdENoaWxkLCAyMyk7Ci1NYXJrdXAu ZHVtcCgpOworTWFya3VwLmR1bXAoJ3Rlc3QnKTsKIHMubW9kaWZ5KCJtb3ZlIiwgImJhY2t3YXJk IiwgImxpbmVib3VuZGFyeSIpOwotTWFya3VwLmR1bXAoKTsKK01hcmt1cC5kdW1wKCd0ZXN0Jyk7 CiAKIDwvc2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9zdHlsZS9yZW1vdmUtdW5k ZXJsaW5lLWZyb20tc3R5bGVzaGVldC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Vk aXRpbmcvc3R5bGUvcmVtb3ZlLXVuZGVybGluZS1mcm9tLXN0eWxlc2hlZXQuaHRtbAkocmV2aXNp b24gNjQzNzQpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL3N0eWxlL3JlbW92ZS11bmRlcmxpbmUt ZnJvbS1zdHlsZXNoZWV0Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTM5LDggKzM5LDggQEAgZnVu Y3Rpb24gZWRpdGluZ1Rlc3QoKSB7CiA8L2Rpdj4KIDxzY3JpcHQ+CiBNYXJrdXAuZGVzY3JpcHRp b24oJ1RoaXMgdGVzdHMgcmVtb3ZpbmcgdW5kZXJsaW5lIGZyb20gc3R5bGVzaGVldCAoLmVkaXRp bmcgaGFzIHVuZGVybGluZSkuIEJlY2F1c2UgdGV4dC1kZWNvcmF0aW9uIHRoYXQgY29tZXMgZnJv bSBhIHN0eWxlIHJ1bGUgY2Fubm90IGJlIHB1c2hlZCBkb3duLCB0aGUgdW5kZXJsaW5lIHNob3Vs ZCBzdGF5LiAoc2VlIGJ1ZyAyNzgwOSkuJyk7Ci1NYXJrdXAuc2V0Tm9kZVRvRHVtcCgncm9vdCcp OwogcnVuRWRpdGluZ1Rlc3QoKTsKK01hcmt1cC5kdW1wKCdyb290Jyk7CiA8L3NjcmlwdD4KIDwv Ym9keT4KIDwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1 cC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAu anMJKHJldmlzaW9uIDY0Mzc0KQorKysgTGF5b3V0VGVzdHMvcmVzb3VyY2VzL2R1bXAtYXMtbWFy a3VwLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwyMiArMzUsMTkgQEAgTWFya3VwLmR1bXAgPSBm dW5jdGlvbihvcHRfbm9kZSwgb3B0X2RlcwogICAgIGlmICh0eXBlb2Ygb3B0X25vZGUgPT0gJ3N0 cmluZycpCiAgICAgICAgIG9wdF9ub2RlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQob3B0X25v ZGUpOwogCi0gICAgdmFyIG5vZGUgPSBvcHRfbm9kZSB8fCBNYXJrdXAuX25vZGUgfHwgZG9jdW1l bnQKKyAgICB2YXIgbm9kZSA9IG9wdF9ub2RlIHx8IGRvY3VtZW50CiAgICAgdmFyIG1hcmt1cCA9 ICIiOwogCi0gICAgaWYgKE1hcmt1cC5fdGVzdF9kZXNjcmlwdGlvbiAmJiAhTWFya3VwLl9kdW1w Q2FsbHMpCi0gICAgICAgIG1hcmt1cCArPSBNYXJrdXAuX3Rlc3RfZGVzY3JpcHRpb24gKyAnXG4n OwotCiAgICAgTWFya3VwLl9kdW1wQ2FsbHMrKzsKIAotICAgIC8vIElmIGR1bXAgaXMgbm90IGNh bGxlZCBieSBub3RpZnlEb25lLCB0aGVuIHByaW50IG91dCBvcHRpb25hbCBkZXNjcmlwdGlvbgot ICAgIC8vIGJlY2F1c2UgdGhpcyB0ZXN0IGlzIG1hbnVhbGx5IGNhbGxpbmcgZHVtcC4KLSAgICBp ZiAoIU1hcmt1cC5fZG9uZSB8fCBvcHRfZGVzY3JpcHRpb24pIHsKKyAgICBpZiAoTWFya3VwLl9k dW1wQ2FsbHMgPiAxIHx8IG9wdF9kZXNjcmlwdGlvbikgewogICAgICAgICBpZiAoIW9wdF9kZXNj cmlwdGlvbikKICAgICAgICAgICAgIG9wdF9kZXNjcmlwdGlvbiA9ICJEdW1wIG9mIG1hcmt1cCAi ICsgTWFya3VwLl9kdW1wQ2FsbHMKICAgICAgICAgaWYgKE1hcmt1cC5fZHVtcENhbGxzID4gMSkK LSAgICAgICAgICAgIG1hcmt1cCArPSAnXG4nOworICAgICAgICAgICAgbWFya3VwICs9ICdcbicK ICAgICAgICAgbWFya3VwICs9ICdcbicgKyBvcHRfZGVzY3JpcHRpb24gKyAnOlxuJzsKKyAgICB9 IGVsc2UgeworICAgICAgICBNYXJrdXAuX2ZpcnN0Q2FsbERpZE5vdEhhdmVEZXNjcmlwdGlvbiA9 IHRydWU7CiAgICAgfQogCiAgICAgbWFya3VwICs9IE1hcmt1cC5nZXQobm9kZSk7CkBAIC02MCw2 ICs1NywxMiBAQCBNYXJrdXAuZHVtcCA9IGZ1bmN0aW9uKG9wdF9ub2RlLCBvcHRfZGVzCiAgICAg ICAgIE1hcmt1cC5fY29udGFpbmVyLnN0eWxlLndpZHRoID0gJzEwMCUnOwogICAgIH0KIAorICAg IGlmIChNYXJrdXAuX2R1bXBDYWxscyA+IDEgJiYgTWFya3VwLl9maXJzdENhbGxEaWROb3RIYXZl RGVzY3JpcHRpb24pIHsKKyAgICAgICAgTWFya3VwLl9jb250YWluZXIuaW5zZXJ0QmVmb3JlKAor ICAgICAgICAgICAgZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoJ1xuRHVtcCBvZiBtYXJrdXAgMTpc bicpLAorICAgICAgICAgICAgTWFya3VwLl9jb250YWluZXIuZmlyc3RDaGlsZC5uZXh0U2libGlu Zyk7CisgICAgfQorCiAgICAgLy8gRklYTUU6IEhhdmUgdGhpcyByZXNwZWN0IGxheW91dFRlc3RD b250cm9sbGVyLmR1bXBDaGlsZEZyYW1lc0FzVGV4dD8KICAgICAvLyBGSVhNRTogU2hvdWxkIHdl IGNhcmUgYWJvdXQgZnJhbWVzZXRzPwogICAgIHZhciBpZnJhbWVzID0gbm9kZS5nZXRFbGVtZW50 c0J5VGFnTmFtZSgnaWZyYW1lJyk7CkBAIC03Miw2ICs3NSw5IEBAIE1hcmt1cC5kdW1wID0gZnVu Y3Rpb24ob3B0X25vZGUsIG9wdF9kZXMKICAgICAgICAgfQogICAgIH0KIAorICAgIGlmIChNYXJr dXAuX3Rlc3RfZGVzY3JpcHRpb24gJiYgTWFya3VwLl9kdW1wQ2FsbHMgPT0gMSkKKyAgICAgICAg TWFya3VwLl9jb250YWluZXIuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoTWFy a3VwLl90ZXN0X2Rlc2NyaXB0aW9uICsgJ1xuJykpCisKICAgICBNYXJrdXAuX2NvbnRhaW5lci5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShtYXJrdXApKTsKIH0KIApAQCAtODks OCArOTUsOCBAQCBNYXJrdXAud2FpdFVudGlsRG9uZSA9IGZ1bmN0aW9uKCkKIE1hcmt1cC5ub3Rp ZnlEb25lID0gZnVuY3Rpb24oKQogewogICAgIC8vIE5lZWQgdG8gd2FpdFVudGlsRG9uZSBvciBz b21lIHRlc3RzIHdvbid0IGZpbmlzaCBhcHBlbmRpbmcgdGhlIG1hcmt1cCBiZWZvcmUgdGhlIHRl eHQgaXMgZHVtcGVkLgotICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsK LSAgICBNYXJrdXAuX2RvbmUgPSB0cnVlOworICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpCisgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKIAog ICAgIC8vIElmIGR1bXAgaGFzIGFscmVhZHkgYmVlbiBjYWxsZWQsIGRvbid0IGJvdGhlciB0byBk dW1wIGFnYWluCiAgICAgaWYgKCFNYXJrdXAuX2R1bXBDYWxscykKQEAgLTEwOCwxMyArMTE0LDYg QEAgTWFya3VwLm5vdGlmeURvbmUgPSBmdW5jdGlvbigpCiAgICAgICAgIGxheW91dFRlc3RDb250 cm9sbGVyLm5vdGlmeURvbmUoKTsKIH0KIAotTWFya3VwLnNldE5vZGVUb0R1bXAgPSBmdW5jdGlv bihub2RlKQotewotICAgIGlmICh0eXBlb2Ygbm9kZSA9PSAic3RyaW5nIikKLSAgICAgICAgbm9k ZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKG5vZGUpOwotICAgIE1hcmt1cC5fbm9kZSA9IG5v ZGUKLX0KLQogTWFya3VwLmdldCA9IGZ1bmN0aW9uKG5vZGUpCiB7CiAgICAgaWYgKCFub2RlLmZp cnN0Q2hpbGQpCg== 63271 2010-08-02 15:41:24 -0700 2010-08-02 15:45:47 -0700 Fixed per Ojan's comment. Asked him to take a look again bug-43286-20100802154123.patch text/plain 9144 rniwa SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY0MzkyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDctMzAgIFJ5b3N1a2UgTml3YSAgPHJu aXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmVtb3ZlIHNldE5vZGVUb0R1bXAgZnJvbSBkdW1wLWFzLW1hcmt1cC5qcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDMyODYKKworICAg ICAgICBSZW1vdmVkIFJlbW92ZWQgTWFya3VwLnNldE5vZGVUb0R1bXAsIHJlcGxhY2VkIGFsbCBj YWxscyB0byB0aGlzIG1ldGhvZCBieSBjYWxscyB0byBkdW1wLgorICAgICAgICBCZWNhdXNlIHdl IHdhbnQgbmVlZCB0byBhdm9pZCBwcmludGluZyAiRHVtcCBvZiBtYXJrdXAgMToiIHdoZW4gZHVt cCBpcyBjYWxsZWQgb25seSBvbmNlLAorICAgICAgICBNYXJrdXAuZHVtcCBubyBsb25nZXIgYWRk cyB0aGUgdGV4dCBvbiB0aGUgZmlyc3QgY2FsbC4gSW5zdGVhZCwgaXQnbGwgaW5zZXJ0IHRoZSB0 ZXh0CisgICAgICAgIG9uIHRoZSBzZWNvbmQgY2FsbCB3aGVuIHRoZSBmaXJzdCBjYWxsIGRpZG4n dCBoYXZlIHRoZSBkZXNjcmlwdGlvbi4KKworICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQv Y3JlYXRlLWxpc3QtZnJvbS1yYW5nZS1zZWxlY3Rpb24uaHRtbDogUmVwbGFjZWQgc2V0Tm9kZVRv RHVtcCBieSBkdW1wCisgICAgICAgICogZWRpdGluZy9leGVjQ29tbWFuZC9oaWxpdGVjb2xvci5o dG1sOiBSZXBsYWNlZCBzZXROb2RlVG9EdW1wIGJ5IGR1bXAKKyAgICAgICAgKiBlZGl0aW5nL2V4 ZWNDb21tYW5kL2luc2VydC1saXN0LWVtcHR5LWRpdi5odG1sOiBSZXBsYWNlZCBzZXROb2RlVG9E dW1wIGJ5IGR1bXAKKyAgICAgICAgKiBlZGl0aW5nL2V4ZWNDb21tYW5kL3N3aXRjaC1saXN0LXR5 cGUtd2l0aC1pbm5lci1saXN0Lmh0bWw6IFJlcGxhY2VkIHNldE5vZGVUb0R1bXAgYnkgZHVtcAor ICAgICAgICAqIGVkaXRpbmcvZXhlY0NvbW1hbmQvc3dpdGNoLWxpc3QtdHlwZS13aXRoLW9ycGhh bmVkLWxpLmh0bWw6IFJlcGxhY2VkIHNldE5vZGVUb0R1bXAgYnkgZHVtcAorICAgICAgICAqIGVk aXRpbmcvc2VsZWN0aW9uL2hvbWUtaW5zaWRlLW5vbmVkaXRhYmxlLXRhYmxlLmh0bWw6IFJlcGxh Y2VkIHNldE5vZGVUb0R1bXAgYnkgZHVtcAorICAgICAgICAqIGVkaXRpbmcvc3R5bGUvcmVtb3Zl LXVuZGVybGluZS1mcm9tLXN0eWxlc2hlZXQuaHRtbDogUmVwbGFjZWQgc2V0Tm9kZVRvRHVtcCBi eSBkdW1wCisgICAgICAgICogcmVzb3VyY2VzL2R1bXAtYXMtbWFya3VwLmpzOiBSZW1vdmVkIE1h cmt1cC5zZXROb2RlVG9EdW1wLgorICAgICAgICAoTWFya3VwLmR1bXApOgorICAgICAgICAoTWFy a3VwLm5vdGlmeURvbmUpOgorCiAyMDEwLTA3LTMwICBBbmRyZXcgV2lsc29uICA8YXR3aWxzb25A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgcm9sbGJhY2sgZm9yIHI2NDM3NSBi ZWNhdXNlIGl0IGJyb2tlIGNocm9taXVtIHRlc3RzCkluZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5n L2V4ZWNDb21tYW5kL2NyZWF0ZS1saXN0LWZyb20tcmFuZ2Utc2VsZWN0aW9uLmh0bWwKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9jcmVhdGUtbGlzdC1mcm9t LXJhbmdlLXNlbGVjdGlvbi5odG1sCShyZXZpc2lvbiA2NDM3NCkKKysrIExheW91dFRlc3RzL2Vk aXRpbmcvZXhlY0NvbW1hbmQvY3JlYXRlLWxpc3QtZnJvbS1yYW5nZS1zZWxlY3Rpb24uaHRtbAko d29ya2luZyBjb3B5KQpAQCAtNyw1ICs3LDUgQEAgdmFyIHN0YXJ0ID0gZG9jdW1lbnQuZ2V0RWxl bWVudEJ5SWQoInN0YQogdmFyIGVuZCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJlbmQiKS5m aXJzdENoaWxkOwogcy5zZXRCYXNlQW5kRXh0ZW50KHN0YXJ0LCAyLCBlbmQsIDIpOwogZG9jdW1l bnQuZXhlY0NvbW1hbmQoIkluc2VydE9yZGVyZWRMaXN0IiwgZmFsc2UsICIiKTsKLU1hcmt1cC5z ZXROb2RlVG9EdW1wKCJ0ZXN0Iik7CitNYXJrdXAuZHVtcCgidGVzdCIpOwogPC9zY3JpcHQ+Cklu ZGV4OiBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL2hpbGl0ZWNvbG9yLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFuZC9oaWxpdGVjb2xvci5o dG1sCShyZXZpc2lvbiA2NDM3NCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQv aGlsaXRlY29sb3IuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTQsNSArMTQsNSBAQCBzZWwubW9k aWZ5KCJleHRlbmQiLCAiYmFja3dhcmQiLCAid29yZCIpCiBkb2N1bWVudC5leGVjQ29tbWFuZCgi SGlsaXRlQ29sb3IiLCBmYWxzZSwgInJlZCIpOwogc2VsLm1vZGlmeSgibW92ZSIsICJiYWNrd2Fy ZCIsICJsaW5lIik7CiAKLU1hcmt1cC5zZXROb2RlVG9EdW1wKCd0ZXN0JykKK01hcmt1cC5kdW1w KCd0ZXN0JykKIDwvc2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9pbnNlcnQtbGlzdC1lbXB0eS1kaXYuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9l ZGl0aW5nL2V4ZWNDb21tYW5kL2luc2VydC1saXN0LWVtcHR5LWRpdi5odG1sCShyZXZpc2lvbiA2 NDM3NCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvaW5zZXJ0LWxpc3QtZW1w dHktZGl2Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTgsNSArOCw1IEBAIHZhciBkaXYgPSBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgiZGl2IikKIHNlbC5zZXRQb3NpdGlvbihkaXYsIDApOwogCiBk b2N1bWVudC5leGVjQ29tbWFuZCgiSW5zZXJ0VW5vcmRlcmVkTGlzdCIpOwotTWFya3VwLnNldE5v ZGVUb0R1bXAoImRpdiIpOworTWFya3VwLmR1bXAoImRpdiIpOwogPC9zY3JpcHQ+CkluZGV4OiBM YXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3N3aXRjaC1saXN0LXR5cGUtd2l0aC1pbm5l ci1saXN0Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9leGVjQ29tbWFu ZC9zd2l0Y2gtbGlzdC10eXBlLXdpdGgtaW5uZXItbGlzdC5odG1sCShyZXZpc2lvbiA2NDM3NCkK KysrIExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvc3dpdGNoLWxpc3QtdHlwZS13aXRo LWlubmVyLWxpc3QuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMTEsMTAgKzExLDExIEBACiA8L2Rp dj4KIDxzY3JpcHQ+CiBNYXJrdXAuZGVzY3JpcHRpb24oJ1RoaXMgdGVzdHMgc3dpdGNoaW5nIGFu IHVub3JkZXJlZCBsaXN0IHdpdGggYSBuZXN0ZWQgbGlzdCB0byBhbiBvcmRlcmVkIGxpc3QuJyk7 Ci1NYXJrdXAuc2V0Tm9kZVRvRHVtcCgndGVzdCcpOwogCiB2YXIgdGVzdCA9IGRvY3VtZW50Lmdl dEVsZW1lbnRCeUlkKCd0ZXN0Jyk7CiB3aW5kb3cuZ2V0U2VsZWN0aW9uKCkuc2VsZWN0QWxsQ2hp bGRyZW4odGVzdCk7CiBkb2N1bWVudC5leGVjQ29tbWFuZCgnSW5zZXJ0T3JkZXJlZExpc3QnLCBm YWxzZSwgbnVsbCk7CisKK01hcmt1cC5kdW1wKCd0ZXN0Jyk7CiA8L3NjcmlwdD4KIDwvYm9keT4K SW5kZXg6IExheW91dFRlc3RzL2VkaXRpbmcvZXhlY0NvbW1hbmQvc3dpdGNoLWxpc3QtdHlwZS13 aXRoLW9ycGhhbmVkLWxpLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZWRpdGluZy9l eGVjQ29tbWFuZC9zd2l0Y2gtbGlzdC10eXBlLXdpdGgtb3JwaGFuZWQtbGkuaHRtbAkocmV2aXNp b24gNjQzNzQpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL2V4ZWNDb21tYW5kL3N3aXRjaC1saXN0 LXR5cGUtd2l0aC1vcnBoYW5lZC1saS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xNCwxMCArMTQs MTEgQEAKIDwvZGl2PgogPHNjcmlwdD4KIE1hcmt1cC5kZXNjcmlwdGlvbignVGhpcyB0ZXN0cyBz d2l0Y2hpbmcgbXVsdGlwbGUgbGlzdHMgd2l0aCBhbiBvcnBoYW5lZCBsaXN0IGNoaWxkIHRvIGFu IG9yZGVyZWQgbGlzdC4nKTsKLU1hcmt1cC5zZXROb2RlVG9EdW1wKCd0ZXN0Jyk7CiAKIHZhciB0 ZXN0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Rlc3QnKTsKIHdpbmRvdy5nZXRTZWxlY3Rp b24oKS5zZWxlY3RBbGxDaGlsZHJlbih0ZXN0KTsKIGRvY3VtZW50LmV4ZWNDb21tYW5kKCdJbnNl cnRPcmRlcmVkTGlzdCcsIGZhbHNlLCBudWxsKTsKKworTWFya3VwLmR1bXAoJ3Rlc3QnKTsKIDwv c2NyaXB0PgogPC9ib2R5PgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9zZWxlY3Rpb24vaG9t ZS1pbnNpZGUtbm9uZWRpdGFibGUtdGFibGUuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9lZGl0aW5nL3NlbGVjdGlvbi9ob21lLWluc2lkZS1ub25lZGl0YWJsZS10YWJsZS5odG1sCShy ZXZpc2lvbiA2NDM3NCkKKysrIExheW91dFRlc3RzL2VkaXRpbmcvc2VsZWN0aW9uL2hvbWUtaW5z aWRlLW5vbmVkaXRhYmxlLXRhYmxlLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTEyLDEyICsxMiwx MSBAQAogPHNjcmlwdD4KIAogTWFya3VwLmRlc2NyaXB0aW9uKCJUZXN0cyB3aGV0aGVyIGhvbWUg bW92ZXMgdGhlIGNhcmV0IHRvIHRoZSBiZWdpbm5pbmcgb2YgbGluZSBpbnNpZGUgYSBjb250ZW50 LWVkaXRhYmxlIGluIGFuIHVuZWRpdGFibGUgdGFibGUuIikKLU1hcmt1cC5zZXROb2RlVG9EdW1w KCd0ZXN0Jyk7CiAKIHZhciBzID0gd2luZG93LmdldFNlbGVjdGlvbigpOwogcy5zZXRQb3NpdGlv bihkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnbDEnKS5maXJzdENoaWxkLCAyMyk7Ci1NYXJrdXAu ZHVtcCgpOworTWFya3VwLmR1bXAoJ3Rlc3QnKTsKIHMubW9kaWZ5KCJtb3ZlIiwgImJhY2t3YXJk IiwgImxpbmVib3VuZGFyeSIpOwotTWFya3VwLmR1bXAoKTsKK01hcmt1cC5kdW1wKCd0ZXN0Jyk7 CiAKIDwvc2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvZWRpdGluZy9zdHlsZS9yZW1vdmUtdW5k ZXJsaW5lLWZyb20tc3R5bGVzaGVldC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Vk aXRpbmcvc3R5bGUvcmVtb3ZlLXVuZGVybGluZS1mcm9tLXN0eWxlc2hlZXQuaHRtbAkocmV2aXNp b24gNjQzNzQpCisrKyBMYXlvdXRUZXN0cy9lZGl0aW5nL3N0eWxlL3JlbW92ZS11bmRlcmxpbmUt ZnJvbS1zdHlsZXNoZWV0Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTM5LDggKzM5LDggQEAgZnVu Y3Rpb24gZWRpdGluZ1Rlc3QoKSB7CiA8L2Rpdj4KIDxzY3JpcHQ+CiBNYXJrdXAuZGVzY3JpcHRp b24oJ1RoaXMgdGVzdHMgcmVtb3ZpbmcgdW5kZXJsaW5lIGZyb20gc3R5bGVzaGVldCAoLmVkaXRp bmcgaGFzIHVuZGVybGluZSkuIEJlY2F1c2UgdGV4dC1kZWNvcmF0aW9uIHRoYXQgY29tZXMgZnJv bSBhIHN0eWxlIHJ1bGUgY2Fubm90IGJlIHB1c2hlZCBkb3duLCB0aGUgdW5kZXJsaW5lIHNob3Vs ZCBzdGF5LiAoc2VlIGJ1ZyAyNzgwOSkuJyk7Ci1NYXJrdXAuc2V0Tm9kZVRvRHVtcCgncm9vdCcp OwogcnVuRWRpdGluZ1Rlc3QoKTsKK01hcmt1cC5kdW1wKCdyb290Jyk7CiA8L3NjcmlwdD4KIDwv Ym9keT4KIDwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL3Jlc291cmNlcy9kdW1wLWFzLW1hcmt1 cC5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9yZXNvdXJjZXMvZHVtcC1hcy1tYXJrdXAu anMJKHJldmlzaW9uIDY0Mzc0KQorKysgTGF5b3V0VGVzdHMvcmVzb3VyY2VzL2R1bXAtYXMtbWFy a3VwLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwyMyArMzUsMTkgQEAgTWFya3VwLmR1bXAgPSBm dW5jdGlvbihvcHRfbm9kZSwgb3B0X2RlcwogICAgIGlmICh0eXBlb2Ygb3B0X25vZGUgPT0gJ3N0 cmluZycpCiAgICAgICAgIG9wdF9ub2RlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQob3B0X25v ZGUpOwogCi0gICAgdmFyIG5vZGUgPSBvcHRfbm9kZSB8fCBNYXJrdXAuX25vZGUgfHwgZG9jdW1l bnQKKyAgICB2YXIgbm9kZSA9IG9wdF9ub2RlIHx8IGRvY3VtZW50CiAgICAgdmFyIG1hcmt1cCA9 ICIiOwogCi0gICAgaWYgKE1hcmt1cC5fdGVzdF9kZXNjcmlwdGlvbiAmJiAhTWFya3VwLl9kdW1w Q2FsbHMpCi0gICAgICAgIG1hcmt1cCArPSBNYXJrdXAuX3Rlc3RfZGVzY3JpcHRpb24gKyAnXG4n OwotCiAgICAgTWFya3VwLl9kdW1wQ2FsbHMrKzsKIAotICAgIC8vIElmIGR1bXAgaXMgbm90IGNh bGxlZCBieSBub3RpZnlEb25lLCB0aGVuIHByaW50IG91dCBvcHRpb25hbCBkZXNjcmlwdGlvbgot ICAgIC8vIGJlY2F1c2UgdGhpcyB0ZXN0IGlzIG1hbnVhbGx5IGNhbGxpbmcgZHVtcC4KLSAgICBp ZiAoIU1hcmt1cC5fZG9uZSB8fCBvcHRfZGVzY3JpcHRpb24pIHsKKyAgICBpZiAoTWFya3VwLl9k dW1wQ2FsbHMgPiAxIHx8IG9wdF9kZXNjcmlwdGlvbikgewogICAgICAgICBpZiAoIW9wdF9kZXNj cmlwdGlvbikKICAgICAgICAgICAgIG9wdF9kZXNjcmlwdGlvbiA9ICJEdW1wIG9mIG1hcmt1cCAi ICsgTWFya3VwLl9kdW1wQ2FsbHMKICAgICAgICAgaWYgKE1hcmt1cC5fZHVtcENhbGxzID4gMSkK ICAgICAgICAgICAgIG1hcmt1cCArPSAnXG4nOwogICAgICAgICBtYXJrdXAgKz0gJ1xuJyArIG9w dF9kZXNjcmlwdGlvbiArICc6XG4nOwotICAgIH0KKyAgICB9IGVsc2UKKyAgICAgICAgTWFya3Vw Ll9maXJzdENhbGxEaWROb3RIYXZlRGVzY3JpcHRpb24gPSB0cnVlOwogCiAgICAgbWFya3VwICs9 IE1hcmt1cC5nZXQobm9kZSk7CiAKQEAgLTYwLDYgKzU2LDExIEBAIE1hcmt1cC5kdW1wID0gZnVu Y3Rpb24ob3B0X25vZGUsIG9wdF9kZXMKICAgICAgICAgTWFya3VwLl9jb250YWluZXIuc3R5bGUu d2lkdGggPSAnMTAwJSc7CiAgICAgfQogCisgICAgaWYgKE1hcmt1cC5fZHVtcENhbGxzID09IDIg JiYgTWFya3VwLl9maXJzdENhbGxEaWROb3RIYXZlRGVzY3JpcHRpb24pIHsKKyAgICAgICAgdmFy IHdyYXBwZXIgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnZHVtcC1hcy1tYXJrdXAtMScpOwor ICAgICAgICB3cmFwcGVyLmluc2VydEJlZm9yZShkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgnXG5E dW1wIG9mIG1hcmt1cCAxOlxuJyksIHdyYXBwZXIuZmlyc3RDaGlsZCk7CisgICAgfQorCiAgICAg Ly8gRklYTUU6IEhhdmUgdGhpcyByZXNwZWN0IGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBDaGls ZEZyYW1lc0FzVGV4dD8KICAgICAvLyBGSVhNRTogU2hvdWxkIHdlIGNhcmUgYWJvdXQgZnJhbWVz ZXRzPwogICAgIHZhciBpZnJhbWVzID0gbm9kZS5nZXRFbGVtZW50c0J5VGFnTmFtZSgnaWZyYW1l Jyk7CkBAIC03Miw3ICs3MywxMyBAQCBNYXJrdXAuZHVtcCA9IGZ1bmN0aW9uKG9wdF9ub2RlLCBv cHRfZGVzCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBNYXJrdXAuX2NvbnRhaW5lci5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShtYXJrdXApKTsKKyAgICBpZiAoTWFya3VwLl90 ZXN0X2Rlc2NyaXB0aW9uICYmIE1hcmt1cC5fZHVtcENhbGxzID09IDEpCisgICAgICAgIE1hcmt1 cC5fY29udGFpbmVyLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKE1hcmt1cC5f dGVzdF9kZXNjcmlwdGlvbiArICdcbicpKQorCisgICAgdmFyIHdyYXBwZXIgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCdzcGFuJyk7CisgICAgd3JhcHBlci5zZXRBdHRyaWJ1dGUoJ2lkJywgJ2R1 bXAtYXMtbWFya3VwLScgKyBNYXJrdXAuX2R1bXBDYWxscyk7CisgICAgd3JhcHBlci5hcHBlbmRD aGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZShtYXJrdXApKTsKKyAgICBNYXJrdXAuX2NvbnRh aW5lci5hcHBlbmRDaGlsZCh3cmFwcGVyKTsKIH0KIAogTWFya3VwLm5vQXV0b0R1bXAgPSBmdW5j dGlvbigpCkBAIC04OSw4ICs5Niw4IEBAIE1hcmt1cC53YWl0VW50aWxEb25lID0gZnVuY3Rpb24o KQogTWFya3VwLm5vdGlmeURvbmUgPSBmdW5jdGlvbigpCiB7CiAgICAgLy8gTmVlZCB0byB3YWl0 VW50aWxEb25lIG9yIHNvbWUgdGVzdHMgd29uJ3QgZmluaXNoIGFwcGVuZGluZyB0aGUgbWFya3Vw IGJlZm9yZSB0aGUgdGV4dCBpcyBkdW1wZWQuCi0gICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2Fp dFVudGlsRG9uZSgpOwotICAgIE1hcmt1cC5fZG9uZSA9IHRydWU7CisgICAgaWYgKHdpbmRvdy5s YXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVu dGlsRG9uZSgpOwogCiAgICAgLy8gSWYgZHVtcCBoYXMgYWxyZWFkeSBiZWVuIGNhbGxlZCwgZG9u J3QgYm90aGVyIHRvIGR1bXAgYWdhaW4KICAgICBpZiAoIU1hcmt1cC5fZHVtcENhbGxzKQpAQCAt MTA4LDEzICsxMTUsNiBAQCBNYXJrdXAubm90aWZ5RG9uZSA9IGZ1bmN0aW9uKCkKICAgICAgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOwogfQogCi1NYXJrdXAuc2V0Tm9kZVRv RHVtcCA9IGZ1bmN0aW9uKG5vZGUpCi17Ci0gICAgaWYgKHR5cGVvZiBub2RlID09ICJzdHJpbmci KQotICAgICAgICBub2RlID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQobm9kZSk7Ci0gICAgTWFy a3VwLl9ub2RlID0gbm9kZQotfQotCiBNYXJrdXAuZ2V0ID0gZnVuY3Rpb24obm9kZSkKIHsKICAg ICBpZiAoIW5vZGUuZmlyc3RDaGlsZCkK