54873 2011-02-21 04:55:51 -0800 Can not force XML without style information to dump as text. 2011-02-22 21:54:47 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik webkit-unassigned ap commit-queue pfeldman oldest_to_newest 354529 0 vsevik 2011-02-21 04:55:51 -0800 JavaScript calls to Layout Test Controller can not be used in layout tests for XML viewer (see https://bugs.webkit.org/show_bug.cgi?id=13807) because these XML documents should not have any style information. 355197 1 83303 vsevik 2011-02-22 05:24:42 -0800 Created attachment 83303 Patch 355211 2 83303 pfeldman 2011-02-22 06:00:11 -0800 Comment on attachment 83303 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83303&action=review > Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp:620 > + setDumpPixels(false); No layoutTestController() prefix intentional? > Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:496 > + WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page); Why is this chance necessary? 355253 3 83303 vsevik 2011-02-22 07:32:45 -0800 Comment on attachment 83303 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83303&action=review >> Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp:620 >> + setDumpPixels(false); > > No layoutTestController() prefix intentional? Yes, QT implementation does not support dumpPixels property of layoutTestController. >> Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:496 >> + WKBundleFrameRef frame = WKBundlePageGetMainFrame(m_page); > > Why is this chance necessary? It's the same change for Webkit2 port. In Webkit2 layoutTestController is created in injected bundle and the information about test url is not available, so I read it from frame. 355857 4 commit-queue 2011-02-22 21:51:30 -0800 The commit-queue encountered the following flaky tests while processing attachment 83303: animations/suspend-resume-animation.html bug 48161 (author: cmarrin@apple.com) The commit-queue is continuing to process your patch. 355863 5 83303 commit-queue 2011-02-22 21:54:42 -0800 Comment on attachment 83303 Patch Clearing flags on attachment: 83303 Committed r79403: <http://trac.webkit.org/changeset/79403> 355864 6 commit-queue 2011-02-22 21:54:47 -0800 All reviewed patches have been landed. Closing bug. 83303 2011-02-22 05:24:42 -0800 2011-02-22 21:54:42 -0800 Patch dump text/plain 9482 vsevik ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0MmIw YTFjLi4xZmFmMjdlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTEtMDItMjIgIFZzZXZvbG9kIFZsYXNvdiAgPHZz ZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgRHVtcFJlbmRlclRyZWUgc2hvdWxkIGR1bXAgYXMgdGV4dCBpZiB0ZXN0IHBh dGggY29udGFpbnMgImR1bXBBc1RleHQvIgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NTQ4NzMKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL0xheW91dFRlc3RDb250cm9sbGVyLmg6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxl cjo6c2V0U2hvdWxkRHVtcEFzVGV4dCk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6 c2V0U2hvdWxkR2VuZXJhdGVQaXhlbFJlc3VsdHMpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVl L2Nocm9taXVtL1Rlc3RTaGVsbC5jcHA6CisgICAgICAgIChUZXN0U2hlbGw6OnJ1bkZpbGVUZXN0 KToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwOgorICAg ICAgICAoc2hvdWxkRHVtcEFzVGV4dCk6CisgICAgICAgIChkdW1wKToKKyAgICAgICAgKHJ1blRl c3QpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbToKKyAg ICAgICAgKHNob3VsZER1bXBBc1RleHQpOgorICAgICAgICAocnVuVGVzdCk6CisgICAgICAgICog RHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojppc0R1bXBBc1RleHRUZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlOjpv cGVuKToKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwOgor ICAgICAgICAoc2hvdWxkRHVtcEFzVGV4dCk6CisgICAgICAgIChydW5UZXN0KToKKyAgICAgICAg KiBXZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHA6 CisgICAgICAgIChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6ZHVtcCk6CisKIDIwMTEtMDItMjEg IEx1a2FzeiBTbGFjaGNpYWsgIDxsLnNsYWNoY2lha0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBbnRvbmlvIEdvbWVzLgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRyb2xsZXIuaCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2Nocm9taXVtL0xheW91dFRlc3RDb250cm9sbGVyLmgKaW5kZXggNTM0YTRhZS4uNjE1MDEzMyAx MDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vTGF5b3V0VGVzdENvbnRy b2xsZXIuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9MYXlvdXRUZXN0Q29u dHJvbGxlci5oCkBAIC0zNDMsNiArMzQzLDcgQEAgcHVibGljOgogCiAgICAgV2ViS2l0OjpXZWJT cGVlY2hJbnB1dENvbnRyb2xsZXIqIHNwZWVjaElucHV0Q29udHJvbGxlcihXZWJLaXQ6OldlYlNw ZWVjaElucHV0TGlzdGVuZXIqKTsKICAgICBib29sIHNob3VsZER1bXBBc1RleHQoKSB7IHJldHVy biBtX2R1bXBBc1RleHQ7IH0KKyAgICB2b2lkIHNldFNob3VsZER1bXBBc1RleHQoYm9vbCB2YWx1 ZSkgeyBtX2R1bXBBc1RleHQgPSB2YWx1ZTsgfQogICAgIGJvb2wgc2hvdWxkRHVtcEVkaXRpbmdD YWxsYmFja3MoKSB7IHJldHVybiBtX2R1bXBFZGl0aW5nQ2FsbGJhY2tzOyB9CiAgICAgYm9vbCBz aG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKCkgeyByZXR1cm4gbV9kdW1wRnJhbWVMb2FkQ2Fs bGJhY2tzOyB9CiAgICAgdm9pZCBzZXRTaG91bGREdW1wRnJhbWVMb2FkQ2FsbGJhY2tzKGJvb2wg dmFsdWUpIHsgbV9kdW1wRnJhbWVMb2FkQ2FsbGJhY2tzID0gdmFsdWU7IH0KQEAgLTM1OCw2ICsz NTksNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBzaG91bGREdW1wQ2hpbGRGcmFtZVNjcm9sbFBvc2l0 aW9ucygpIHsgcmV0dXJuIG1fZHVtcENoaWxkRnJhbWVTY3JvbGxQb3NpdGlvbnM7IH0KICAgICBi b29sIHNob3VsZER1bXBDaGlsZEZyYW1lc0FzVGV4dCgpIHsgcmV0dXJuIG1fZHVtcENoaWxkRnJh bWVzQXNUZXh0OyB9CiAgICAgYm9vbCBzaG91bGRHZW5lcmF0ZVBpeGVsUmVzdWx0cygpIHsgcmV0 dXJuIG1fZ2VuZXJhdGVQaXhlbFJlc3VsdHM7IH0KKyAgICB2b2lkIHNldFNob3VsZEdlbmVyYXRl UGl4ZWxSZXN1bHRzKGJvb2wgdmFsdWUpIHsgbV9nZW5lcmF0ZVBpeGVsUmVzdWx0cyA9IHZhbHVl OyB9CiAgICAgYm9vbCBhY2NlcHRzRWRpdGluZygpIHsgcmV0dXJuIG1fYWNjZXB0c0VkaXRpbmc7 IH0KICAgICBib29sIGNhbk9wZW5XaW5kb3dzKCkgeyByZXR1cm4gbV9jYW5PcGVuV2luZG93czsg fQogICAgIGJvb2wgc2hvdWxkQWRkRmlsZVRvUGFzdGVib2FyZCgpIHsgcmV0dXJuIG1fc2hvdWxk QWRkRmlsZVRvUGFzdGVib2FyZDsgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUv Y2hyb21pdW0vVGVzdFNoZWxsLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL1Rl c3RTaGVsbC5jcHAKaW5kZXggZDg4OGU3Yy4uMTRmOWFiOCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvY2hyb21pdW0vVGVzdFNoZWxsLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9jaHJvbWl1bS9UZXN0U2hlbGwuY3BwCkBAIC0xNzMsMjAgKzE3MywyMSBAQCB2b2lkIFRl c3RTaGVsbDo6cnVuRmlsZVRlc3QoY29uc3QgVGVzdFBhcmFtcyYgcGFyYW1zKQogICAgIG1fcGFy YW1zID0gcGFyYW1zOwogICAgIHN0cmluZyB0ZXN0VXJsID0gbV9wYXJhbXMudGVzdFVybC5zcGVj KCk7CiAKLSAgICBib29sIGluc3BlY3RvclRlc3RNb2RlID0gdGVzdFVybC5maW5kKCIvaW5zcGVj dG9yLyIpICE9IHN0cmluZzo6bnBvcwotICAgICAgICB8fCB0ZXN0VXJsLmZpbmQoIlxcaW5zcGVj dG9yXFwiKSAhPSBzdHJpbmc6Om5wb3M7Ci0KLSAgICBtX3ByZWZzLmRldmVsb3BlckV4dHJhc0Vu YWJsZWQgPSAgaW5zcGVjdG9yVGVzdE1vZGUKLSAgICAgICAgfHwgdGVzdFVybC5maW5kKCIvaW5z cGVjdG9yLWVuYWJsZWQvIikgIT0gc3RyaW5nOjpucG9zCi0gICAgICAgIHx8IHRlc3RVcmwuZmlu ZCgiXFxpbnNwZWN0b3ItZW5hYmxlZFxcIikgIT0gc3RyaW5nOjpucG9zOwotCisgICAgbV9wcmVm cy5kZXZlbG9wZXJFeHRyYXNFbmFibGVkID0gdHJ1ZTsKICAgICBhcHBseVByZWZlcmVuY2VzKCk7 CiAKICAgICBpZiAodGVzdFVybC5maW5kKCJsb2FkaW5nLyIpICE9IHN0cmluZzo6bnBvcwogICAg ICAgICB8fCB0ZXN0VXJsLmZpbmQoImxvYWRpbmdcXCIpICE9IHN0cmluZzo6bnBvcykKICAgICAg ICAgbV9sYXlvdXRUZXN0Q29udHJvbGxlci0+c2V0U2hvdWxkRHVtcEZyYW1lTG9hZENhbGxiYWNr cyh0cnVlKTsKIAotICAgIGlmIChpbnNwZWN0b3JUZXN0TW9kZSkKKyAgICBpZiAodGVzdFVybC5m aW5kKCIvZHVtcEFzVGV4dC8iKSAhPSBzdHJpbmc6Om5wb3MKKyAgICAgICAgfHwgdGVzdFVybC5m aW5kKCJcXGR1bXBBc1RleHRcXCIpICE9IHN0cmluZzo6bnBvcykgeworICAgICAgICBtX2xheW91 dFRlc3RDb250cm9sbGVyLT5zZXRTaG91bGREdW1wQXNUZXh0KHRydWUpOworICAgICAgICBtX2xh eW91dFRlc3RDb250cm9sbGVyLT5zZXRTaG91bGRHZW5lcmF0ZVBpeGVsUmVzdWx0cyhmYWxzZSk7 CisgICAgfQorCisgICAgaWYgKHRlc3RVcmwuZmluZCgiL2luc3BlY3Rvci8iKSAhPSBzdHJpbmc6 Om5wb3MKKyAgICAgICAgfHwgdGVzdFVybC5maW5kKCJcXGluc3BlY3RvclxcIikgIT0gc3RyaW5n OjpucG9zKQogICAgICAgICBzaG93RGV2VG9vbHMoKTsKIAogICAgIGlmIChtX2R1bXBXaGVuRmlu aXNoZWQpCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRy ZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcAppbmRl eCA3OWM3OTRhLi42OWEzNWY3IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsv RHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVu ZGVyVHJlZS5jcHAKQEAgLTEwNSw2ICsxMDUsMTEgQEAgc3RhdGljIGJvb2wgc2hvdWxkT3Blbldl Ykluc3BlY3Rvcihjb25zdCBzdHJpbmcmIHBhdGhPclVSTCkKICAgICByZXR1cm4gcGF0aE9yVVJM LmZpbmQoImluc3BlY3Rvci8iKSAhPSBzdHJpbmc6Om5wb3M7CiB9CiAKK3N0YXRpYyBib29sIHNo b3VsZER1bXBBc1RleHQoY29uc3Qgc3RyaW5nJiBwYXRoT3JVUkwpCit7CisgICAgcmV0dXJuIHBh dGhPclVSTC5maW5kKCJkdW1wQXNUZXh0LyIpICE9IHN0cmluZzo6bnBvczsKK30KKwogc3RhdGlj IGJvb2wgc2hvdWxkRW5hYmxlRGV2ZWxvcGVyRXh0cmFzKGNvbnN0IHN0cmluZyYgcGF0aE9yVVJM KQogewogICAgIHJldHVybiB0cnVlOwpAQCAtNTEyLDcgKzUxNyw3IEBAIHZvaWQgZHVtcCgpCiAg ICAgICAgIGdjaGFyKiByZXNwb25zZU1pbWVUeXBlID0gd2Via2l0X3dlYl9mcmFtZV9nZXRfcmVz cG9uc2VfbWltZV90eXBlKG1haW5GcmFtZSk7CiAKICAgICAgICAgaWYgKGdfc3RyX2VxdWFsKHJl c3BvbnNlTWltZVR5cGUsICJ0ZXh0L3BsYWluIikpIHsKLSAgICAgICAgICAgIGdMYXlvdXRUZXN0 Q29udHJvbGxlci0+c2V0RHVtcEFzVGV4dCh0cnVlKTsgICAgICAgIAorICAgICAgICAgICAgZ0xh eW91dFRlc3RDb250cm9sbGVyLT5zZXREdW1wQXNUZXh0KHRydWUpOwogICAgICAgICAgICAgZ0xh eW91dFRlc3RDb250cm9sbGVyLT5zZXRHZW5lcmF0ZVBpeGVsUmVzdWx0cyhmYWxzZSk7CiAgICAg ICAgIH0KICAgICAgICAgZ19mcmVlKHJlc3BvbnNlTWltZVR5cGUpOwpAQCAtNjM4LDYgKzY0Mywx MCBAQCBzdGF0aWMgdm9pZCBydW5UZXN0KGNvbnN0IHN0cmluZyYgdGVzdFBhdGhPclVSTCkKICAg ICAgICAgZ0xheW91dFRlc3RDb250cm9sbGVyLT5zZXREZXZlbG9wZXJFeHRyYXNFbmFibGVkKHRy dWUpOwogICAgICAgICBpZiAoc2hvdWxkT3BlbldlYkluc3BlY3Rvcih0ZXN0VVJMKSkKICAgICAg ICAgICAgIGdMYXlvdXRUZXN0Q29udHJvbGxlci0+c2hvd1dlYkluc3BlY3RvcigpOworICAgICAg ICBpZiAoc2hvdWxkRHVtcEFzVGV4dCh0ZXN0VVJMKSkgeworICAgICAgICAgICAgZ0xheW91dFRl c3RDb250cm9sbGVyLT5zZXREdW1wQXNUZXh0KHRydWUpOworICAgICAgICAgICAgZ0xheW91dFRl c3RDb250cm9sbGVyLT5zZXRHZW5lcmF0ZVBpeGVsUmVzdWx0cyhmYWxzZSk7CisgICAgICAgIH0K ICAgICB9CiAKICAgICBXb3JrUXVldWU6OnNoYXJlZCgpLT5jbGVhcigpOwpkaWZmIC0tZ2l0IGEv VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tCmluZGV4IDhmMDExZGQuLjQ5ZjU4YTIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQorKysg Yi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRyZWUubW0KQEAgLTk5Niw2ICs5 OTYsMTEgQEAgc3RhdGljIGJvb2wgc2hvdWxkT3BlbldlYkluc3BlY3Rvcihjb25zdCBjaGFyKiBw YXRoT3JVUkwpCiAgICAgcmV0dXJuIHN0cnN0cihwYXRoT3JVUkwsICJpbnNwZWN0b3IvIik7CiB9 CiAKK3N0YXRpYyBib29sIHNob3VsZER1bXBBc1RleHQoY29uc3QgY2hhciogcGF0aE9yVVJMKQor eworICAgIHJldHVybiBzdHJzdHIocGF0aE9yVVJMLCAiZHVtcEFzVGV4dC8iKTsKK30KKwogc3Rh dGljIGJvb2wgc2hvdWxkRW5hYmxlRGV2ZWxvcGVyRXh0cmFzKGNvbnN0IGNoYXIqIHBhdGhPclVS TCkKIHsKICAgICByZXR1cm4gdHJ1ZTsKQEAgLTEwOTAsNiArMTA5NSwxMCBAQCBzdGF0aWMgdm9p ZCBydW5UZXN0KGNvbnN0IHN0cmluZyYgdGVzdFBhdGhPclVSTCkKICAgICAgICAgZ0xheW91dFRl c3RDb250cm9sbGVyLT5zZXREZXZlbG9wZXJFeHRyYXNFbmFibGVkKHRydWUpOwogICAgICAgICBp ZiAoc2hvdWxkT3BlbldlYkluc3BlY3RvcihwYXRoT3JVUkwuY19zdHIoKSkpCiAgICAgICAgICAg ICBnTGF5b3V0VGVzdENvbnRyb2xsZXItPnNob3dXZWJJbnNwZWN0b3IoKTsKKyAgICAgICAgaWYg KHNob3VsZER1bXBBc1RleHQocGF0aE9yVVJMLmNfc3RyKCkpKSB7CisgICAgICAgICAgICBnTGF5 b3V0VGVzdENvbnRyb2xsZXItPnNldER1bXBBc1RleHQodHJ1ZSk7CisgICAgICAgICAgICBnTGF5 b3V0VGVzdENvbnRyb2xsZXItPnNldEdlbmVyYXRlUGl4ZWxSZXN1bHRzKGZhbHNlKTsKKyAgICAg ICAgfQogICAgIH0KIAogICAgIGlmIChbV2ViSGlzdG9yeSBvcHRpb25hbFNoYXJlZEhpc3Rvcnld KQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5j cHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAppbmRleCA2 MWIyYTliLi40OTBiMWI4IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1w UmVuZGVyVHJlZVF0LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVy VHJlZVF0LmNwcApAQCAtNTk2LDYgKzU5NiwxNCBAQCBzdGF0aWMgYm9vbCBpc1dlYkluc3BlY3Rv clRlc3QoY29uc3QgUVVybCYgdXJsKQogICAgIHJldHVybiBmYWxzZTsKIH0KIAorc3RhdGljIGJv b2wgaXNEdW1wQXNUZXh0VGVzdChjb25zdCBRVXJsJiB1cmwpCit7CisgICAgaWYgKHVybC5wYXRo KCkuY29udGFpbnMoImR1bXBBc1RleHQvIikpCisgICAgICAgIHJldHVybiB0cnVlOworICAgIHJl dHVybiBmYWxzZTsKK30KKworCiB2b2lkIER1bXBSZW5kZXJUcmVlOjpvcGVuKGNvbnN0IFFVcmwm IHVybCkKIHsKICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6ZHVtcFJlc291cmNlTG9hZENh bGxiYWNrc1BhdGgoUUZpbGVJbmZvKHVybC50b1N0cmluZygpKS5wYXRoKCkpOwpAQCAtNjA3LDYg KzYxNSwxMSBAQCB2b2lkIER1bXBSZW5kZXJUcmVlOjpvcGVuKGNvbnN0IFFVcmwmIHVybCkKICAg ICBpZiAoaXNXZWJJbnNwZWN0b3JUZXN0KHVybCkpCiAgICAgICAgIGxheW91dFRlc3RDb250cm9s bGVyKCktPnNob3dXZWJJbnNwZWN0b3IoKTsKIAorICAgIGlmIChpc0R1bXBBc1RleHRUZXN0KHVy bCkpIHsKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIoKS0+ZHVtcEFzVGV4dCgpOworICAg ICAgICBzZXREdW1wUGl4ZWxzKGZhbHNlKTsKKyAgICB9CisKICAgICBpZiAoaXNHbG9iYWxIaXN0 b3J5VGVzdCh1cmwpKQogICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlcigpLT5kdW1wSGlzdG9y eUNhbGxiYWNrcygpOwogCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS93aW4vRHVt cFJlbmRlclRyZWUuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvd2luL0R1bXBSZW5kZXJUcmVl LmNwcAppbmRleCAzMzUzMzFmLi4wMDJmNGFlIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVy VHJlZS93aW4vRHVtcFJlbmRlclRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3dp bi9EdW1wUmVuZGVyVHJlZS5jcHAKQEAgLTc2Myw2ICs3NjMsMTEgQEAgc3RhdGljIGJvb2wgc2hv dWxkT3BlbldlYkluc3BlY3Rvcihjb25zdCBjaGFyKiBwYXRoT3JVUkwpCiAgICAgcmV0dXJuIHN0 cnN0cihwYXRoT3JVUkwsICIvaW5zcGVjdG9yLyIpIHx8IHN0cnN0cihwYXRoT3JVUkwsICJcXGlu c3BlY3RvclxcIik7CiB9CiAKK3N0YXRpYyBib29sIHNob3VsZER1bXBBc1RleHQoY29uc3QgY2hh ciogcGF0aE9yVVJMKQoreworICAgIHJldHVybiBzdHJzdHIocGF0aE9yVVJMLCAiL2R1bXBBc1Rl eHQvIikgfHwgc3Ryc3RyKHBhdGhPclVSTCwgIlxcZHVtcEFzVGV4dFxcIik7Cit9CisKIHN0YXRp YyBib29sIHNob3VsZEVuYWJsZURldmVsb3BlckV4dHJhcyhjb25zdCBjaGFyKiBwYXRoT3JVUkwp CiB7CiAgICAgcmV0dXJuIHRydWU7CkBAIC05NTgsNiArOTYzLDEwIEBAIHN0YXRpYyB2b2lkIHJ1 blRlc3QoY29uc3Qgc3RyaW5nJiB0ZXN0UGF0aE9yVVJMKQogICAgICAgICBpZiAoc2hvdWxkT3Bl bldlYkluc3BlY3RvcihwYXRoT3JVUkwuY19zdHIoKSkpCiAgICAgICAgICAgICBnTGF5b3V0VGVz dENvbnRyb2xsZXItPnNob3dXZWJJbnNwZWN0b3IoKTsKICAgICB9CisgICAgaWYgKHNob3VsZER1 bXBBc1RleHQocGF0aE9yVVJMLmNfc3RyKCkpKSB7CisgICAgICAgIGdMYXlvdXRUZXN0Q29udHJv bGxlci0+c2V0RHVtcEFzVGV4dCh0cnVlKTsKKyAgICAgICAgZ0xheW91dFRlc3RDb250cm9sbGVy LT5zZXRHZW5lcmF0ZVBpeGVsUmVzdWx0cyhmYWxzZSk7CisgICAgfQogCiAgICAgcHJldlRlc3RC Rkl0ZW0gPSAwOwogICAgIGlmICh3ZWJWaWV3KSB7CmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAgYi9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKaW5k ZXggNzM5ZGEzYi4uOTRkZTBkNyAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcApAQCAtNDkzLDYg KzQ5MywxMSBAQCB2b2lkIEluamVjdGVkQnVuZGxlUGFnZTo6ZHVtcCgpCiAKICAgICBJbmplY3Rl ZEJ1bmRsZTo6c2hhcmVkKCkubGF5b3V0VGVzdENvbnRyb2xsZXIoKS0+aW52YWxpZGF0ZVdhaXRU b0R1bXBXYXRjaGRvZ1RpbWVyKCk7CiAKKyAgICBXS0J1bmRsZUZyYW1lUmVmIGZyYW1lID0gV0tC dW5kbGVQYWdlR2V0TWFpbkZyYW1lKG1fcGFnZSk7CisgICAgc3RyaW5nIHVybCA9IHRvU1REKGFk b3B0V0soV0tVUkxDb3B5U3RyaW5nKGFkb3B0V0soV0tCdW5kbGVGcmFtZUNvcHlVUkwoZnJhbWUp KS5nZXQoKSkpKTsKKyAgICBpZiAoc3Ryc3RyKHVybC5jX3N0cigpLCAiZHVtcEFzVGV4dC8iKSkK KyAgICAgICAgSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLmxheW91dFRlc3RDb250cm9sbGVyKCkt PmR1bXBBc1RleHQoKTsKKwogICAgIHN3aXRjaCAoSW5qZWN0ZWRCdW5kbGU6OnNoYXJlZCgpLmxh eW91dFRlc3RDb250cm9sbGVyKCktPndoYXRUb0R1bXAoKSkgewogICAgIGNhc2UgTGF5b3V0VGVz dENvbnRyb2xsZXI6OlJlbmRlclRyZWU6IHsKICAgICAgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdS ZWY+IHRleHQoQWRvcHRXSywgV0tCdW5kbGVQYWdlQ29weVJlbmRlclRyZWVFeHRlcm5hbFJlcHJl c2VudGF0aW9uKG1fcGFnZSkpOwo=