112260 2013-03-13 08:01:47 -0700 [Qt] Port DRT to use TestRunner::dumpAsText() 2013-03-14 03:09:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 109677 1 zeno zeno oldest_to_newest 854296 0 zeno 2013-03-13 08:01:47 -0700 [Qt] Port DRT to use TestRunner::dumpAsText() 854298 1 192923 zeno 2013-03-13 08:03:46 -0700 Created attachment 192923 Patch 854303 2 192923 hausmann 2013-03-13 08:12:11 -0700 Comment on attachment 192923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192923&action=review > Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp:994 > - if (m_dumpPixelsForCurrentTest && m_controller->shouldDumpPixels()) { > + if (m_dumpPixelsForCurrentTest) { Shouldn't this use m_jscController->generatePixelResults() ? What do the other ports do there? 854317 3 192928 zeno 2013-03-13 08:32:34 -0700 Created attachment 192928 Patch 854971 4 192928 benjamin 2013-03-13 22:57:48 -0700 Comment on attachment 192928 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192928&action=review Looks reasonable. > Tools/ChangeLog:15 > + TestRunnerQt::shouldDumpPixels() always returned true > + in our case and can therefore be replaced with > + TestRunner::generatePixelResults(). I am a little confused by this sentence. 855104 5 zeno 2013-03-14 03:09:41 -0700 Committed r145800: <http://trac.webkit.org/changeset/145800> 192923 2013-03-13 08:03:46 -0700 2013-03-13 08:32:30 -0700 Patch bug-112260-20130313155943.patch text/plain 6180 zeno U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1NzA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTlmYTFjZjQ2ODE5YjU1ZjhlNzRiYmZmYjkyMWFlMWVm ZWJmNzhhMS4uNDdhYjg0ZDk1MGVmNTFjMDgxNjg5OTJkNTMxYzQ5NDFmNmVlYjU4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDEzLTAzLTEzICBaZW5vIEFsYmlzc2VyICA8emVub0B3ZWJraXQub3JnPgorCisgICAg ICAgIFtRdF0gUG9ydCBEUlQgdG8gdXNlIFRlc3RSdW5uZXI6OmR1bXBBc1RleHQoKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyMjYwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJl ZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkR1bXBSZW5kZXJU cmVlOjpvcGVuKToKKyAgICAgICAgKFdlYkNvcmU6Om1ldGhvZE5hbWVTdHJpbmdGb3JGYWlsZWRU ZXN0KToKKyAgICAgICAgICAgIENoYW5nZSBwYXJhbWV0ZXIgZnJvbSB0eXBlIFRlc3RSdW5uZXJR dCogdG8gVGVzdFJ1bm5lciouCisgICAgICAgIChXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZTo6ZHVt cCk6CisgICAgICAgICAgICBUZXN0UnVubmVyUXQ6OnNob3VsZER1bXBQaXhlbHMoKSBhbHdheXMg cmV0dXJuZWQgdHJ1ZQorICAgICAgICAgICAgaW4gb3VyIGNhc2UgYW5kIGNhbiB0aGVyZWZvcmUg YmUgcmVtb3ZlZC4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9UZXN0UnVubmVyUXQuY3Bw OgorICAgICAgICAoVGVzdFJ1bm5lclF0OjpyZXNldCk6CisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvcXQvVGVzdFJ1bm5lclF0Lmg6CisgICAgICAgIChUZXN0UnVubmVyUXQpOgorCiAyMDEzLTAz LTEzICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQGRpZ2lhLmNvbT4KIAogICAgICAg ICBbUXRdIFVucmV2aWV3ZWQgdHJpdmlhbCB0eXBvIGZpeApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVt cFJlbmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAppbmRleCA3YWVjZjFmMWFlNzQzODE3NDdhOTVmNjBm OTM3N2UyMmJhNTRjMGYzLi5kOGZhYzVkODk5MTBiYWY1NTBkZDQ5ZDFhYzFhMjY5MGIwMmU0MjNm IDEwMDc1NQotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNw cAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcApAQCAt NjA5LDcgKzYwOSw3IEBAIHZvaWQgRHVtcFJlbmRlclRyZWU6Om9wZW4oY29uc3QgUVVybCYgdXJs KQogICAgICAgICB0ZXN0UnVubmVyKCktPnNob3dXZWJJbnNwZWN0b3IoKTsKIAogICAgIGlmIChp c0R1bXBBc1RleHRUZXN0KHVybCkpCi0gICAgICAgIHRlc3RSdW5uZXIoKS0+ZHVtcEFzVGV4dCgp OworICAgICAgICBtX2pzY0NvbnRyb2xsZXItPnNldER1bXBBc1RleHQodHJ1ZSk7CiAKICAgICBp ZiAoaXNHbG9iYWxIaXN0b3J5VGVzdCh1cmwpKQogICAgICAgICB0ZXN0UnVubmVyKCktPmR1bXBI aXN0b3J5Q2FsbGJhY2tzKCk7CkBAIC05MjMsMTAgKzkyMywxMCBAQCBRU3RyaW5nIER1bXBSZW5k ZXJUcmVlOjpkdW1wQmFja0ZvcndhcmRMaXN0KFFXZWJQYWdlKiBwYWdlKQogICAgIHJldHVybiBy ZXN1bHQ7CiB9CiAKLXN0YXRpYyBjb25zdCBjaGFyICptZXRob2ROYW1lU3RyaW5nRm9yRmFpbGVk VGVzdChUZXN0UnVubmVyUXQgKmNvbnRyb2xsZXIpCitzdGF0aWMgY29uc3QgY2hhciAqbWV0aG9k TmFtZVN0cmluZ0ZvckZhaWxlZFRlc3QoVGVzdFJ1bm5lciAqY29udHJvbGxlcikKIHsKICAgICBj b25zdCBjaGFyICplcnJvck1lc3NhZ2U7Ci0gICAgaWYgKGNvbnRyb2xsZXItPnNob3VsZER1bXBB c1RleHQoKSkKKyAgICBpZiAoY29udHJvbGxlci0+ZHVtcEFzVGV4dCgpKQogICAgICAgICBlcnJv ck1lc3NhZ2UgPSAiW2RvY3VtZW50RWxlbWVudCBpbm5lclRleHRdIjsKICAgICAvLyBGSVhNRTog QWRkIHdoZW4gd2UgaGF2ZSBzdXBwb3J0CiAgICAgLy9lbHNlIGlmIChjb250cm9sbGVyLT5kdW1w RE9NQXNXZWJBcmNoaXZlKCkpCkBAIC05NTQsNyArOTU0LDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJl ZTo6ZHVtcCgpCiAKICAgICBRU3RyaW5nIG1pbWVUeXBlID0gRHVtcFJlbmRlclRyZWVTdXBwb3J0 UXQ6OnJlc3BvbnNlTWltZVR5cGUobWFpbkZyYW1lLT5oYW5kbGUoKSk7CiAgICAgaWYgKG1pbWVU eXBlID09ICJ0ZXh0L3BsYWluIikKLSAgICAgICAgbV9jb250cm9sbGVyLT5kdW1wQXNUZXh0KCk7 CisgICAgICAgIG1fanNjQ29udHJvbGxlci0+c2V0RHVtcEFzVGV4dCh0cnVlKTsKIAogICAgIC8v IER1bXAgcmVuZGVyIHRleHQuLi4KICAgICBRU3RyaW5nIHJlc3VsdFN0cmluZzsKQEAgLTk2Myw3 ICs5NjMsNyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlOjpkdW1wKCkKICAgICBpZiAobV9jb250cm9s bGVyLT5zaG91bGREdW1wQXNBdWRpbygpKSB7CiAgICAgICAgIHJlc3VsdENvbnRlbnRUeXBlID0g ImF1ZGlvL3dhdiI7CiAgICAgICAgIHJlc3VsdERhdGEgPSBtX2NvbnRyb2xsZXItPmF1ZGlvRGF0 YSgpOwotICAgIH0gZWxzZSBpZiAobV9jb250cm9sbGVyLT5zaG91bGREdW1wQXNUZXh0KCkpCisg ICAgfSBlbHNlIGlmIChtX2pzY0NvbnRyb2xsZXItPmR1bXBBc1RleHQoKSkKICAgICAgICAgcmVz dWx0U3RyaW5nID0gZHVtcEZyYW1lc0FzVGV4dChtYWluRnJhbWUpOwogICAgIGVsc2UgewogICAg ICAgICByZXN1bHRTdHJpbmcgPSBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6ZnJhbWVSZW5kZXJU cmVlRHVtcChtYWluRnJhbWUtPmhhbmRsZSgpKTsKQEAgLTk4NSwxMyArOTg1LDEzIEBAIHZvaWQg RHVtcFJlbmRlclRyZWU6OmR1bXAoKQogICAgICAgICBmcHJpbnRmKHN0ZG91dCwgIkNvbnRlbnQt VHJhbnNmZXItRW5jb2Rpbmc6IGJhc2U2NFxuIik7CiAgICAgICAgIGZwcmludGYoc3Rkb3V0LCAi JXMiLCByZXN1bHREYXRhLnRvQmFzZTY0KCkuY29uc3REYXRhKCkpOwogICAgIH0gZWxzZQotICAg ICAgICBwcmludGYoIkVSUk9SOiBuaWwgcmVzdWx0IGZyb20gJXMiLCBtZXRob2ROYW1lU3RyaW5n Rm9yRmFpbGVkVGVzdChtX2NvbnRyb2xsZXIpKTsKKyAgICAgICAgcHJpbnRmKCJFUlJPUjogbmls IHJlc3VsdCBmcm9tICVzIiwgbWV0aG9kTmFtZVN0cmluZ0ZvckZhaWxlZFRlc3QobV9qc2NDb250 cm9sbGVyLmdldCgpKSk7CiAKICAgICAvLyBzaWduYWwgZW5kIG9mIHRleHQgYmxvY2sKICAgICBm cHV0cygiI0VPRlxuIiwgc3Rkb3V0KTsKICAgICBmcHV0cygiI0VPRlxuIiwgc3RkZXJyKTsKIAot ICAgIGlmIChtX2R1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCAmJiBtX2NvbnRyb2xsZXItPnNob3Vs ZER1bXBQaXhlbHMoKSkgeworICAgIGlmIChtX2R1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCkgewog ICAgICAgICBRSW1hZ2UgaW1hZ2U7CiAgICAgICAgIGlmICghbV9jb250cm9sbGVyLT5pc1ByaW50 aW5nKCkpIHsKICAgICAgICAgICAgIGltYWdlID0gUUltYWdlKG1fcGFnZS0+dmlld3BvcnRTaXpl KCksIFFJbWFnZTo6Rm9ybWF0X0FSR0IzMik7CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9xdC9UZXN0UnVubmVyUXQuY3BwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvVGVzdFJ1 bm5lclF0LmNwcAppbmRleCBmNTQxNzUyMTMzNGQ5NTVjOWU1MTE5MTVjMTk0YjkxMWZkMjc2NTlh Li4xMWNiNGYyMDhjZGVjZTgyYWZmMTY0OWNiMmMyMjE5MmJkOTU3NGM3IDEwMDY0NAotLS0gYS9U b29scy9EdW1wUmVuZGVyVHJlZS9xdC9UZXN0UnVubmVyUXQuY3BwCisrKyBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL3F0L1Rlc3RSdW5uZXJRdC5jcHAKQEAgLTU2LDkgKzU2LDcgQEAgdm9pZCBUZXN0 UnVubmVyUXQ6OnJlc2V0KCkKIHsKICAgICBtX2hhc0R1bXBlZCA9IGZhbHNlOwogICAgIG1fbG9h ZEZpbmlzaGVkID0gZmFsc2U7Ci0gICAgbV90ZXh0RHVtcCA9IGZhbHNlOwogICAgIG1fYXVkaW9E dW1wID0gZmFsc2U7Ci0gICAgbV9zaG91bGREdW1wUGl4ZWxzID0gdHJ1ZTsKICAgICBtX2R1bXBC YWNrRm9yd2FyZExpc3QgPSBmYWxzZTsKICAgICBtX2R1bXBDaGlsZHJlbkFzVGV4dCA9IGZhbHNl OwogICAgIG1fZHVtcENoaWxkRnJhbWVTY3JvbGxQb3NpdGlvbnMgPSBmYWxzZTsKQEAgLTE1NSwx MiArMTUzLDYgQEAgdm9pZCBUZXN0UnVubmVyUXQ6Om1heWJlRHVtcChib29sIC8qc3VjY2Vzcyov KQogICAgIH0KIH0KIAotdm9pZCBUZXN0UnVubmVyUXQ6OmR1bXBBc1RleHQoYm9vbCBzaG91bGRE dW1wUGl4ZWxzKQotewotICAgIG1fdGV4dER1bXAgPSB0cnVlOwotICAgIG1fc2hvdWxkRHVtcFBp eGVscyA9IHNob3VsZER1bXBQaXhlbHM7Ci19Ci0KIHZvaWQgVGVzdFJ1bm5lclF0Ojp3YWl0VW50 aWxEb25lKCkKIHsKICAgICAvL3FEZWJ1ZygpIDw8ICI+Pj4+d2FpdEZvckRvbmUiOwpkaWZmIC0t Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvVGVzdFJ1bm5lclF0LmggYi9Ub29scy9EdW1w UmVuZGVyVHJlZS9xdC9UZXN0UnVubmVyUXQuaAppbmRleCA2NWJiYjgyYTJjYjQxM2U3MjE5NzM4 YmZhN2U1ODMwN2NiY2NkYzBlLi4zNTE1M2RmZGQzMzczMzM0OWUxMGMzZjJiMDIwYmM3NDNjNmVm YjI3IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9UZXN0UnVubmVyUXQuaAor KysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9UZXN0UnVubmVyUXQuaApAQCAtNjEsOSArNjEs NyBAQCBwdWJsaWM6CiAgICAgVGVzdFJ1bm5lclF0KFdlYkNvcmU6OkR1bXBSZW5kZXJUcmVlKik7 CiAKICAgICBib29sIHNob3VsZERpc2FsbG93SW5jcmVhc2VGb3JBcHBsaWNhdGlvbkNhY2hlUXVv dGEoKSBjb25zdCB7IHJldHVybiBtX2Rpc2FsbG93SW5jcmVhc2VGb3JBcHBsaWNhdGlvbkNhY2hl UXVvdGE7IH0KLSAgICBib29sIHNob3VsZER1bXBBc1RleHQoKSBjb25zdCB7IHJldHVybiBtX3Rl eHREdW1wOyB9CiAgICAgYm9vbCBzaG91bGREdW1wQXNBdWRpbygpIGNvbnN0IHsgcmV0dXJuIG1f YXVkaW9EdW1wOyB9Ci0gICAgYm9vbCBzaG91bGREdW1wUGl4ZWxzKCkgY29uc3QgeyByZXR1cm4g bV9zaG91bGREdW1wUGl4ZWxzOyB9CiAgICAgYm9vbCBzaG91bGREdW1wQmFja0ZvcndhcmRMaXN0 KCkgY29uc3QgeyByZXR1cm4gbV9kdW1wQmFja0ZvcndhcmRMaXN0OyB9CiAgICAgYm9vbCBzaG91 bGREdW1wQ2hpbGRyZW5Bc1RleHQoKSBjb25zdCB7IHJldHVybiBtX2R1bXBDaGlsZHJlbkFzVGV4 dDsgfQogICAgIGJvb2wgc2hvdWxkRHVtcENoaWxkRnJhbWVTY3JvbGxQb3NpdGlvbnMoKSBjb25z dCB7IHJldHVybiBtX2R1bXBDaGlsZEZyYW1lU2Nyb2xsUG9zaXRpb25zOyB9CkBAIC0xMDEsNyAr OTksNiBAQCBRX1NJR05BTFM6CiBwdWJsaWMgUV9TTE9UUzoKICAgICB2b2lkIG1heWJlRHVtcChi b29sIG9rKTsKICAgICB2b2lkIGRpc2FsbG93SW5jcmVhc2VGb3JBcHBsaWNhdGlvbkNhY2hlUXVv dGEoKSB7IG1fZGlzYWxsb3dJbmNyZWFzZUZvckFwcGxpY2F0aW9uQ2FjaGVRdW90YSA9IHRydWU7 IH0KLSAgICB2b2lkIGR1bXBBc1RleHQoYm9vbCBzaG91bGREdW1wUGl4ZWxzID0gZmFsc2UpOwog ICAgIHZvaWQgZHVtcENoaWxkRnJhbWVzQXNUZXh0KCkgeyBtX2R1bXBDaGlsZHJlbkFzVGV4dCA9 IHRydWU7IH0KICAgICB2b2lkIGR1bXBDaGlsZEZyYW1lU2Nyb2xsUG9zaXRpb25zKCkgeyBtX2R1 bXBDaGlsZEZyYW1lU2Nyb2xsUG9zaXRpb25zID0gdHJ1ZTsgfQogICAgIHZvaWQgZHVtcERhdGFi YXNlQ2FsbGJhY2tzKCkgeyBtX2R1bXBEYXRhYmFzZUNhbGxiYWNrcyA9IHRydWU7IH0KQEAgLTI3 NCw5ICsyNzEsNyBAQCBwcml2YXRlOgogCiBwcml2YXRlOgogICAgIGJvb2wgbV9oYXNEdW1wZWQ7 Ci0gICAgYm9vbCBtX3RleHREdW1wOwogICAgIGJvb2wgbV9hdWRpb0R1bXA7Ci0gICAgYm9vbCBt X3Nob3VsZER1bXBQaXhlbHM7CiAgICAgYm9vbCBtX2Rpc2FsbG93SW5jcmVhc2VGb3JBcHBsaWNh dGlvbkNhY2hlUXVvdGE7CiAgICAgYm9vbCBtX2R1bXBCYWNrRm9yd2FyZExpc3Q7CiAgICAgYm9v bCBtX2R1bXBDaGlsZHJlbkFzVGV4dDsK 192928 2013-03-13 08:32:34 -0700 2013-03-13 22:57:48 -0700 Patch bug-112260-20130313162831.patch text/plain 6277 zeno U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1NzA5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTlmYTFjZjQ2ODE5YjU1ZjhlNzRiYmZmYjkyMWFlMWVm ZWJmNzhhMS4uOThiMTlhZWM3MTI5OTVkYTMxZWZjMzRjMzRhNDJhN2Q5NDE5NDMwNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDEzLTAzLTEzICBaZW5vIEFsYmlzc2VyICA8emVub0B3ZWJraXQub3JnPgorCisgICAg ICAgIFtRdF0gUG9ydCBEUlQgdG8gdXNlIFRlc3RSdW5uZXI6OmR1bXBBc1RleHQoKQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTEyMjYwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJl ZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkR1bXBSZW5kZXJU cmVlOjpvcGVuKToKKyAgICAgICAgKFdlYkNvcmU6Om1ldGhvZE5hbWVTdHJpbmdGb3JGYWlsZWRU ZXN0KToKKyAgICAgICAgICAgIENoYW5nZSBwYXJhbWV0ZXIgZnJvbSB0eXBlIFRlc3RSdW5uZXJR dCogdG8gVGVzdFJ1bm5lciouCisgICAgICAgIChXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZTo6ZHVt cCk6CisgICAgICAgICAgICBUZXN0UnVubmVyUXQ6OnNob3VsZER1bXBQaXhlbHMoKSBhbHdheXMg cmV0dXJuZWQgdHJ1ZQorICAgICAgICAgICAgaW4gb3VyIGNhc2UgYW5kIGNhbiB0aGVyZWZvcmUg YmUgcmVwbGFjZWQgd2l0aAorICAgICAgICAgICAgVGVzdFJ1bm5lcjo6Z2VuZXJhdGVQaXhlbFJl c3VsdHMoKS4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9xdC9UZXN0UnVubmVyUXQuY3BwOgor ICAgICAgICAoVGVzdFJ1bm5lclF0OjpyZXNldCk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUv cXQvVGVzdFJ1bm5lclF0Lmg6CisgICAgICAgIChUZXN0UnVubmVyUXQpOgorCiAyMDEzLTAzLTEz ICBTaW1vbiBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQGRpZ2lhLmNvbT4KIAogICAgICAgICBb UXRdIFVucmV2aWV3ZWQgdHJpdmlhbCB0eXBvIGZpeApkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvcXQvRHVtcFJlbmRlclRyZWVRdC5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9x dC9EdW1wUmVuZGVyVHJlZVF0LmNwcAppbmRleCA3YWVjZjFmMWFlNzQzODE3NDdhOTVmNjBmOTM3 N2UyMmJhNTRjMGYzLi5hZGE1NzUyYmYxMGY2ODJkOGY1MjFjNGJmOTE5MTFmODkwMGU4MWI4IDEw MDc1NQotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcAor KysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9EdW1wUmVuZGVyVHJlZVF0LmNwcApAQCAtNjA5 LDcgKzYwOSw3IEBAIHZvaWQgRHVtcFJlbmRlclRyZWU6Om9wZW4oY29uc3QgUVVybCYgdXJsKQog ICAgICAgICB0ZXN0UnVubmVyKCktPnNob3dXZWJJbnNwZWN0b3IoKTsKIAogICAgIGlmIChpc0R1 bXBBc1RleHRUZXN0KHVybCkpCi0gICAgICAgIHRlc3RSdW5uZXIoKS0+ZHVtcEFzVGV4dCgpOwor ICAgICAgICBtX2pzY0NvbnRyb2xsZXItPnNldER1bXBBc1RleHQodHJ1ZSk7CiAKICAgICBpZiAo aXNHbG9iYWxIaXN0b3J5VGVzdCh1cmwpKQogICAgICAgICB0ZXN0UnVubmVyKCktPmR1bXBIaXN0 b3J5Q2FsbGJhY2tzKCk7CkBAIC05MjMsMTAgKzkyMywxMCBAQCBRU3RyaW5nIER1bXBSZW5kZXJU cmVlOjpkdW1wQmFja0ZvcndhcmRMaXN0KFFXZWJQYWdlKiBwYWdlKQogICAgIHJldHVybiByZXN1 bHQ7CiB9CiAKLXN0YXRpYyBjb25zdCBjaGFyICptZXRob2ROYW1lU3RyaW5nRm9yRmFpbGVkVGVz dChUZXN0UnVubmVyUXQgKmNvbnRyb2xsZXIpCitzdGF0aWMgY29uc3QgY2hhciAqbWV0aG9kTmFt ZVN0cmluZ0ZvckZhaWxlZFRlc3QoVGVzdFJ1bm5lciAqY29udHJvbGxlcikKIHsKICAgICBjb25z dCBjaGFyICplcnJvck1lc3NhZ2U7Ci0gICAgaWYgKGNvbnRyb2xsZXItPnNob3VsZER1bXBBc1Rl eHQoKSkKKyAgICBpZiAoY29udHJvbGxlci0+ZHVtcEFzVGV4dCgpKQogICAgICAgICBlcnJvck1l c3NhZ2UgPSAiW2RvY3VtZW50RWxlbWVudCBpbm5lclRleHRdIjsKICAgICAvLyBGSVhNRTogQWRk IHdoZW4gd2UgaGF2ZSBzdXBwb3J0CiAgICAgLy9lbHNlIGlmIChjb250cm9sbGVyLT5kdW1wRE9N QXNXZWJBcmNoaXZlKCkpCkBAIC05NTQsNyArOTU0LDcgQEAgdm9pZCBEdW1wUmVuZGVyVHJlZTo6 ZHVtcCgpCiAKICAgICBRU3RyaW5nIG1pbWVUeXBlID0gRHVtcFJlbmRlclRyZWVTdXBwb3J0UXQ6 OnJlc3BvbnNlTWltZVR5cGUobWFpbkZyYW1lLT5oYW5kbGUoKSk7CiAgICAgaWYgKG1pbWVUeXBl ID09ICJ0ZXh0L3BsYWluIikKLSAgICAgICAgbV9jb250cm9sbGVyLT5kdW1wQXNUZXh0KCk7Cisg ICAgICAgIG1fanNjQ29udHJvbGxlci0+c2V0RHVtcEFzVGV4dCh0cnVlKTsKIAogICAgIC8vIER1 bXAgcmVuZGVyIHRleHQuLi4KICAgICBRU3RyaW5nIHJlc3VsdFN0cmluZzsKQEAgLTk2Myw3ICs5 NjMsNyBAQCB2b2lkIER1bXBSZW5kZXJUcmVlOjpkdW1wKCkKICAgICBpZiAobV9jb250cm9sbGVy LT5zaG91bGREdW1wQXNBdWRpbygpKSB7CiAgICAgICAgIHJlc3VsdENvbnRlbnRUeXBlID0gImF1 ZGlvL3dhdiI7CiAgICAgICAgIHJlc3VsdERhdGEgPSBtX2NvbnRyb2xsZXItPmF1ZGlvRGF0YSgp OwotICAgIH0gZWxzZSBpZiAobV9jb250cm9sbGVyLT5zaG91bGREdW1wQXNUZXh0KCkpCisgICAg fSBlbHNlIGlmIChtX2pzY0NvbnRyb2xsZXItPmR1bXBBc1RleHQoKSkKICAgICAgICAgcmVzdWx0 U3RyaW5nID0gZHVtcEZyYW1lc0FzVGV4dChtYWluRnJhbWUpOwogICAgIGVsc2UgewogICAgICAg ICByZXN1bHRTdHJpbmcgPSBEdW1wUmVuZGVyVHJlZVN1cHBvcnRRdDo6ZnJhbWVSZW5kZXJUcmVl RHVtcChtYWluRnJhbWUtPmhhbmRsZSgpKTsKQEAgLTk4NSwxMyArOTg1LDEzIEBAIHZvaWQgRHVt cFJlbmRlclRyZWU6OmR1bXAoKQogICAgICAgICBmcHJpbnRmKHN0ZG91dCwgIkNvbnRlbnQtVHJh bnNmZXItRW5jb2Rpbmc6IGJhc2U2NFxuIik7CiAgICAgICAgIGZwcmludGYoc3Rkb3V0LCAiJXMi LCByZXN1bHREYXRhLnRvQmFzZTY0KCkuY29uc3REYXRhKCkpOwogICAgIH0gZWxzZQotICAgICAg ICBwcmludGYoIkVSUk9SOiBuaWwgcmVzdWx0IGZyb20gJXMiLCBtZXRob2ROYW1lU3RyaW5nRm9y RmFpbGVkVGVzdChtX2NvbnRyb2xsZXIpKTsKKyAgICAgICAgcHJpbnRmKCJFUlJPUjogbmlsIHJl c3VsdCBmcm9tICVzIiwgbWV0aG9kTmFtZVN0cmluZ0ZvckZhaWxlZFRlc3QobV9qc2NDb250cm9s bGVyLmdldCgpKSk7CiAKICAgICAvLyBzaWduYWwgZW5kIG9mIHRleHQgYmxvY2sKICAgICBmcHV0 cygiI0VPRlxuIiwgc3Rkb3V0KTsKICAgICBmcHV0cygiI0VPRlxuIiwgc3RkZXJyKTsKIAotICAg IGlmIChtX2R1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCAmJiBtX2NvbnRyb2xsZXItPnNob3VsZER1 bXBQaXhlbHMoKSkgeworICAgIGlmIChtX2R1bXBQaXhlbHNGb3JDdXJyZW50VGVzdCAmJiBtX2pz Y0NvbnRyb2xsZXItPmdlbmVyYXRlUGl4ZWxSZXN1bHRzKCkpIHsKICAgICAgICAgUUltYWdlIGlt YWdlOwogICAgICAgICBpZiAoIW1fY29udHJvbGxlci0+aXNQcmludGluZygpKSB7CiAgICAgICAg ICAgICBpbWFnZSA9IFFJbWFnZShtX3BhZ2UtPnZpZXdwb3J0U2l6ZSgpLCBRSW1hZ2U6OkZvcm1h dF9BUkdCMzIpOwpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvVGVzdFJ1bm5l clF0LmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL3F0L1Rlc3RSdW5uZXJRdC5jcHAKaW5kZXgg ZjU0MTc1MjEzMzRkOTU1YzllNTExOTE1YzE5NGI5MTFmZDI3NjU5YS4uMTFjYjRmMjA4Y2RlY2U4 MmFmZjE2NDljYjJjMjIxOTJiZDk1NzRjNyAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRy ZWUvcXQvVGVzdFJ1bm5lclF0LmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9UZXN0 UnVubmVyUXQuY3BwCkBAIC01Niw5ICs1Niw3IEBAIHZvaWQgVGVzdFJ1bm5lclF0OjpyZXNldCgp CiB7CiAgICAgbV9oYXNEdW1wZWQgPSBmYWxzZTsKICAgICBtX2xvYWRGaW5pc2hlZCA9IGZhbHNl OwotICAgIG1fdGV4dER1bXAgPSBmYWxzZTsKICAgICBtX2F1ZGlvRHVtcCA9IGZhbHNlOwotICAg IG1fc2hvdWxkRHVtcFBpeGVscyA9IHRydWU7CiAgICAgbV9kdW1wQmFja0ZvcndhcmRMaXN0ID0g ZmFsc2U7CiAgICAgbV9kdW1wQ2hpbGRyZW5Bc1RleHQgPSBmYWxzZTsKICAgICBtX2R1bXBDaGls ZEZyYW1lU2Nyb2xsUG9zaXRpb25zID0gZmFsc2U7CkBAIC0xNTUsMTIgKzE1Myw2IEBAIHZvaWQg VGVzdFJ1bm5lclF0OjptYXliZUR1bXAoYm9vbCAvKnN1Y2Nlc3MqLykKICAgICB9CiB9CiAKLXZv aWQgVGVzdFJ1bm5lclF0OjpkdW1wQXNUZXh0KGJvb2wgc2hvdWxkRHVtcFBpeGVscykKLXsKLSAg ICBtX3RleHREdW1wID0gdHJ1ZTsKLSAgICBtX3Nob3VsZER1bXBQaXhlbHMgPSBzaG91bGREdW1w UGl4ZWxzOwotfQotCiB2b2lkIFRlc3RSdW5uZXJRdDo6d2FpdFVudGlsRG9uZSgpCiB7CiAgICAg Ly9xRGVidWcoKSA8PCAiPj4+PndhaXRGb3JEb25lIjsKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL3F0L1Rlc3RSdW5uZXJRdC5oIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvVGVz dFJ1bm5lclF0LmgKaW5kZXggNjViYmI4MmEyY2I0MTNlNzIxOTczOGJmYTdlNTgzMDdjYmNjZGMw ZS4uMzUxNTNkZmRkMzM3MzMzNDllMTBjM2YyYjAyMGJjNzQzYzZlZmIyNyAxMDA2NDQKLS0tIGEv VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvVGVzdFJ1bm5lclF0LmgKKysrIGIvVG9vbHMvRHVtcFJl bmRlclRyZWUvcXQvVGVzdFJ1bm5lclF0LmgKQEAgLTYxLDkgKzYxLDcgQEAgcHVibGljOgogICAg IFRlc3RSdW5uZXJRdChXZWJDb3JlOjpEdW1wUmVuZGVyVHJlZSopOwogCiAgICAgYm9vbCBzaG91 bGREaXNhbGxvd0luY3JlYXNlRm9yQXBwbGljYXRpb25DYWNoZVF1b3RhKCkgY29uc3QgeyByZXR1 cm4gbV9kaXNhbGxvd0luY3JlYXNlRm9yQXBwbGljYXRpb25DYWNoZVF1b3RhOyB9Ci0gICAgYm9v bCBzaG91bGREdW1wQXNUZXh0KCkgY29uc3QgeyByZXR1cm4gbV90ZXh0RHVtcDsgfQogICAgIGJv b2wgc2hvdWxkRHVtcEFzQXVkaW8oKSBjb25zdCB7IHJldHVybiBtX2F1ZGlvRHVtcDsgfQotICAg IGJvb2wgc2hvdWxkRHVtcFBpeGVscygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkRHVtcFBpeGVs czsgfQogICAgIGJvb2wgc2hvdWxkRHVtcEJhY2tGb3J3YXJkTGlzdCgpIGNvbnN0IHsgcmV0dXJu IG1fZHVtcEJhY2tGb3J3YXJkTGlzdDsgfQogICAgIGJvb2wgc2hvdWxkRHVtcENoaWxkcmVuQXNU ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9kdW1wQ2hpbGRyZW5Bc1RleHQ7IH0KICAgICBib29sIHNo b3VsZER1bXBDaGlsZEZyYW1lU2Nyb2xsUG9zaXRpb25zKCkgY29uc3QgeyByZXR1cm4gbV9kdW1w Q2hpbGRGcmFtZVNjcm9sbFBvc2l0aW9uczsgfQpAQCAtMTAxLDcgKzk5LDYgQEAgUV9TSUdOQUxT OgogcHVibGljIFFfU0xPVFM6CiAgICAgdm9pZCBtYXliZUR1bXAoYm9vbCBvayk7CiAgICAgdm9p ZCBkaXNhbGxvd0luY3JlYXNlRm9yQXBwbGljYXRpb25DYWNoZVF1b3RhKCkgeyBtX2Rpc2FsbG93 SW5jcmVhc2VGb3JBcHBsaWNhdGlvbkNhY2hlUXVvdGEgPSB0cnVlOyB9Ci0gICAgdm9pZCBkdW1w QXNUZXh0KGJvb2wgc2hvdWxkRHVtcFBpeGVscyA9IGZhbHNlKTsKICAgICB2b2lkIGR1bXBDaGls ZEZyYW1lc0FzVGV4dCgpIHsgbV9kdW1wQ2hpbGRyZW5Bc1RleHQgPSB0cnVlOyB9CiAgICAgdm9p ZCBkdW1wQ2hpbGRGcmFtZVNjcm9sbFBvc2l0aW9ucygpIHsgbV9kdW1wQ2hpbGRGcmFtZVNjcm9s bFBvc2l0aW9ucyA9IHRydWU7IH0KICAgICB2b2lkIGR1bXBEYXRhYmFzZUNhbGxiYWNrcygpIHsg bV9kdW1wRGF0YWJhc2VDYWxsYmFja3MgPSB0cnVlOyB9CkBAIC0yNzQsOSArMjcxLDcgQEAgcHJp dmF0ZToKIAogcHJpdmF0ZToKICAgICBib29sIG1faGFzRHVtcGVkOwotICAgIGJvb2wgbV90ZXh0 RHVtcDsKICAgICBib29sIG1fYXVkaW9EdW1wOwotICAgIGJvb2wgbV9zaG91bGREdW1wUGl4ZWxz OwogICAgIGJvb2wgbV9kaXNhbGxvd0luY3JlYXNlRm9yQXBwbGljYXRpb25DYWNoZVF1b3RhOwog ICAgIGJvb2wgbV9kdW1wQmFja0ZvcndhcmRMaXN0OwogICAgIGJvb2wgbV9kdW1wQ2hpbGRyZW5B c1RleHQ7Cg==