142018 2015-02-25 09:51:59 -0800 Layout test support for user content filters 2015-02-25 12:43:27 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson beidson achristensen benjamin oldest_to_newest 1072079 0 beidson 2015-02-25 09:51:59 -0800 Layout test support for user content filters As we work on the feature, we'll need tests. 1072101 1 247335 beidson 2015-02-25 11:26:57 -0800 Created attachment 247335 Patch v1 1072103 2 247335 thorton 2015-02-25 12:23:51 -0800 Comment on attachment 247335 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=247335&action=review > LayoutTests/platform/gtk/TestExpectations:2341 > +http/tests/usercontentfilter [ Skip ] You could skip in the global TestExpectations and unskip in Mac WK2 if you wanted to make less of a mess. > Tools/WebKitTestRunner/mac/TestControllerMac.mm:104 > + char urlCString[16384]; > + WKStringGetUTF8CString(urlString.get(), urlCString, 16384); This is pretty lazy :D 1072104 3 beidson 2015-02-25 12:34:38 -0800 (In reply to comment #2) > Comment on attachment 247335 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=247335&action=review > > > LayoutTests/platform/gtk/TestExpectations:2341 > > +http/tests/usercontentfilter [ Skip ] > > You could skip in the global TestExpectations and unskip in Mac WK2 if you > wanted to make less of a mess. Oh boy, will I ever! > > Tools/WebKitTestRunner/mac/TestControllerMac.mm:104 > > + char urlCString[16384]; > > + WKStringGetUTF8CString(urlString.get(), urlCString, 16384); > > This is pretty lazy :D As discussed on IRC, the commonly used alternative of using pathOrURL() breaks down when you are running WKTR directly from within the directory where the test resides. I'll maybe fix up the other sites that use that approach, in a separate patch :) 1072105 4 beidson 2015-02-25 12:43:27 -0800 http://trac.webkit.org/changeset/180633 247335 2015-02-25 11:26:57 -0800 2015-02-25 12:23:51 -0800 Patch v1 patch text/plain 8607 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiYjExZDVlLi44YTgzNDE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMDIt MjUgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIExheW91dCB0 ZXN0IHN1cHBvcnQgZm9yIHVzZXIgY29udGVudCBmaWx0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDIwMTgKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvdXNlcmNvbnRlbnRmaWx0 ZXIvYmFzaWMtZmlsdGVyLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvdXNlcmNv bnRlbnRmaWx0ZXIvYmFzaWMtZmlsdGVyLmh0bWwuanNvbjogQWRkZWQuCisgICAgICAgICogcGxh dGZvcm0vZWZsL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Rlc3RF eHBlY3RhdGlvbnM6CisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25z OgorICAgICAgICAqIHBsYXRmb3JtL21hYy9odHRwL3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jh c2ljLWZpbHRlci1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL3dpbi9U ZXN0RXhwZWN0YXRpb25zOgorCiAyMDE1LTAyLTI1ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1A YXBwbGUuY29tPgogCiAgICAgICAgIFtXaW5dIFNraXAgbmV3IDxhdHRhY2htZW50PiB0ZXN0IHNp bmNlIGl0J3Mgbm90IHdvcmtpbmcgb24gV2luZG93cy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvdXNlcmNvbnRlbnRmaWx0ZXIvYmFzaWMtZmlsdGVyLmh0bWwgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jhc2ljLWZpbHRlci5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRkZTVlYzgKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jhc2ljLWZpbHRlci5o dG1sCkBAIC0wLDAgKzEsNCBAQAorPGJvZHk+CitUaGUgaW1hZ2UgYmVsb3cgc2hvdWxkIG5vdCBh Y3R1YWxseSBsb2FkLjxicj4KKzxpbWcgc3JjPSJodHRwOi8vbG9jYWxob3N0OjgwMDAvcmVzb3Vy Y2VzL3NxdWFyZTEwMC5wbmciPgorPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy91c2VyY29udGVudGZpbHRlci9iYXNpYy1maWx0ZXIuaHRtbC5qc29uIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRlci9iYXNpYy1maWx0ZXIuaHRtbC5qc29u Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjIxNzFjMmUKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jhc2ljLWZp bHRlci5odG1sLmpzb24KQEAgLTAsMCArMSwxMCBAQAorWworICAgIHsKKyAgICAgICAgImFjdGlv biI6IHsKKyAgICAgICAgICAgICJ0eXBlIjogImJsb2NrIgorICAgICAgICB9LAorICAgICAgICAi dHJpZ2dlciI6IHsKKyAgICAgICAgICAgICJ1cmwtZmlsdGVyIjogImh0dHA6Ly9sb2NhbGhvc3Qi CisgICAgICAgIH0KKyAgICB9CitdClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAzMTU0MGRiLi40NTYwNGUy IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucwor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMjEyOSwz ICsyMTI5LDYgQEAgd2Via2l0Lm9yZy9iLzE0MTg5NiBmYXN0L2JvcmRlcnMvYm9yZGVyLXJhZGl1 cy1vbi1odG1sLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KICMgTmVlZCB0byBpbnZlc3RpZ2F0 ZSB3aHkgdGhlc2Ugc2VjdXJpdHkgdGVzdHMgaGF2ZSBiZWVuIGZhaWxlZCBzaW5jZSByMTQ0MzM4 Lgogd2Via2l0Lm9yZy9iLzE0MTk1OCBodHRwL3Rlc3RzL3NlY3VyaXR5L1hGcmFtZU9wdGlvbnMv eC1mcmFtZS1vcHRpb25zLWRlbnktbXVsdGlwbGUtY2xpZW50cy5odG1sIFsgRmFpbHVyZSBdCiB3 ZWJraXQub3JnL2IvMTQxOTU4IGh0dHAvdGVzdHMvc2VjdXJpdHkvY3Jvc3MtZnJhbWUtYWNjZXNz LWNhbGxiYWNrLWV4cGxpY2l0LWRvbWFpbi1BTExPVy5odG1sIFsgRmFpbHVyZSBdCisKKyMgVXNl ckNvbnRlbnRGaWx0ZXJzIGFyZSBNYWMtV0syLW9ubHkgZm9yIG5vdworaHR0cC90ZXN0cy91c2Vy Y29udGVudGZpbHRlciBbIFNraXAgXQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYjIzZWZmNS4uYzVmMWRj OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMK KysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTIzMzcs NiArMjMzNyw5IEBAIHdlYmtpdC5vcmcvYi8xNDAyNTIgZmFzdC90ZXh0L2tobWVyLWxhby1mb250 Lmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xNDAyNTIgZmFzdC90ZXh0L21pZHdvcmQt YnJlYWstYmVmb3JlLXN1cnJvZ2F0ZS1wYWlyLTIuaHRtbCBbIEZhaWx1cmUgXQogd2Via2l0Lm9y Zy9iLzE0MDI1MiBzdmcvY3VzdG9tL3N2Zy1mb250cy1mYWxsYmFjay54aHRtbCBbIEZhaWx1cmUg XQogCisjIFVzZXJDb250ZW50RmlsdGVycyBhcmUgTWFjLVdLMi1vbmx5IGZvciBub3cKK2h0dHAv dGVzdHMvdXNlcmNvbnRlbnRmaWx0ZXIgWyBTa2lwIF0KKwogIy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8KICMgRW5kIG9mIFRlc3RzIGZhaWxpbmcKICMvLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rl c3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3Rh dGlvbnMKaW5kZXggNGU3YTRjNS4uYTAyNmEyZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L21hYy13azEvVGVzdEV4cGVjdGF0aW9ucwpAQCAtOTMsNSArOTMsOCBAQCBjb21wb3NpdGluZy9p ZnJhbWVzL292ZXJsYXBwZWQtbmVzdGVkLWlmcmFtZXMuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCiBo dHRwL3Rlc3RzL2NhY2hlL2Rpc2stY2FjaGUtdmFsaWRhdGlvbi5odG1sCiBodHRwL3Rlc3RzL2Nh Y2hlL2Rpc2stY2FjaGUtZGlzYWJsZS5odG1sCiAKKyMgVXNlckNvbnRlbnRGaWx0ZXJzIGFyZSBX SzItb25seSBmb3Igbm93CitodHRwL3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyIFsgU2tpcCBdCisK ICMjIyBFTkQgT0YgKDIpIEZhaWx1cmVzIHdpdGhvdXQgYnVnIHJlcG9ydHMKICMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy9odHRwL3Rlc3RzL3VzZXJjb250ZW50ZmlsdGVyL2Jhc2ljLWZpbHRlci1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvaHR0cC90ZXN0cy91c2VyY29udGVu dGZpbHRlci9iYXNpYy1maWx0ZXItZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLmNiZDQyNDcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvaHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRlci9iYXNpYy1maWx0ZXItZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsMTAgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgODAweDYwMAorICBS ZW5kZXJWaWV3IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4 NjAwCisgIFJlbmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5k ZXJCb2R5IHtCT0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRlclRleHQgeyN0 ZXh0fSBhdCAoMCwwKSBzaXplIDI3M3gxOAorICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0 aCAyNzM6ICJUaGUgaW1hZ2UgYmVsb3cgc2hvdWxkIG5vdCBhY3R1YWxseSBsb2FkLiIKKyAgICAg IFJlbmRlckJSIHtCUn0gYXQgKDI3MiwxNCkgc2l6ZSAxeDAKKyAgICAgIFJlbmRlckltYWdlIHtJ TUd9IGF0ICgwLDE4KSBzaXplIDB4MAorICAgICAgUmVuZGVyVGV4dCB7I3RleHR9IGF0ICgwLDAp IHNpemUgMHgwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vVGVzdEV4cGVj dGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0YXRpb25zCmluZGV4 IDQ5NmMxMWEuLmMzZjBhYjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9U ZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9UZXN0RXhwZWN0 YXRpb25zCkBAIC0yMjU0LDYgKzIyNTQsNyBAQCBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3Jh bmdlLXRlc3QuaHRtbCBbIEZhaWx1cmUgXQogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9yZXNw b25zZS1zcGVjaWFsLWNoYXJhY3RlcnMuaHRtbCBbIEZhaWx1cmUgXQogaHR0cC90ZXN0cy94bWxo dHRwcmVxdWVzdC93ZWItYXBwcy8wMTIuaHRtbAogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC93 ZWItYXBwcy8wMTMuaHRtbAoraHR0cC90ZXN0cy91c2VyY29udGVudGZpbHRlciBbIFNraXAgXQog CiAjIEFzc2VydGlvbiBmYWlsdXJlczogTm90IGludmVzdGlnYXRlZAogWyBEZWJ1ZyBdIGh0dHAv dGVzdHMvbG9hZGluZy9wcmVsb2FkLWFwcGVuZC1zY2FuLnBocCBbIFNraXAgXQpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDE3NzMzNmQuLjUyYzE1 M2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNyBAQAorMjAxNS0wMi0yNSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5j b20+CisKKyAgICAgICAgTGF5b3V0IHRlc3Qgc3VwcG9ydCBmb3IgdXNlciBjb250ZW50IGZpbHRl cnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjAx OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2Vi S2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250 cm9sbGVyOjpyZXNldFN0YXRlVG9Db25zaXN0ZW50VmFsdWVzKTogQ2xlYXIgYWxsIHVzZXIgY29u dGVudCBmaWx0ZXJzIGJldHdlZW4gdGVzdHMuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVy L21hYy9UZXN0Q29udHJvbGxlck1hYy5tbToKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6 OnBsYXRmb3JtQ29uZmlndXJlVmlld0ZvclRlc3QpOiBGb3IgYWxsIHRlc3RzIHdpdGggdXNlcmNv bnRlbnRmaWx0ZXIvIGluIHRoZWlyIHBhdGggdHJ5IHRvIGxvYWQgYSBtYXRjaGluZyAuanNvbgor ICAgICAgICAgIGZpbGUgYmVmb3JlIGxvYWRpbmcgdGhlIHRlc3QgaXRzZWxmLgorCiAyMDE1LTAy LTI0ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ29udmVydCBXZWJF ZGl0aW5nVGVzdGVyIHRvIHVzZSB4Y2NvbmZpZyBmaWxlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L1Rlc3RDb250cm9sbGVyLmNwcAppbmRleCAzNDgxMzQwLi4zNWMzMzkyIDEwMDY0NAotLS0gYS9U b29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJL aXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcApAQCAtNjY4LDYgKzY2OCw4IEBAIGJvb2wg VGVzdENvbnRyb2xsZXI6OnJlc2V0U3RhdGVUb0NvbnNpc3RlbnRWYWx1ZXMoKQogCiAgICAgbV9z aG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzID0gZmFsc2U7CiAKKyAgICBXS1BhZ2VHcm91 cFJlbW92ZUFsbFVzZXJDb250ZW50RmlsdGVycyhXS1BhZ2VHZXRQYWdlR3JvdXAobV9tYWluV2Vi Vmlldy0+cGFnZSgpKSk7CisKICAgICAvLyBSZXNldCBtYWluIHBhZ2UgYmFjayB0byBhYm91dDpi bGFuawogICAgIG1fZG9uZVJlc2V0dGluZyA9IGZhbHNlOwogCmRpZmYgLS1naXQgYS9Ub29scy9X ZWJLaXRUZXN0UnVubmVyL21hYy9UZXN0Q29udHJvbGxlck1hYy5tbSBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvbWFjL1Rlc3RDb250cm9sbGVyTWFjLm1tCmluZGV4IDQ2MDY4NTIuLjdkMmNlYzgg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1Rlc3RDb250cm9sbGVyTWFj Lm1tCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvbWFjL1Rlc3RDb250cm9sbGVyTWFjLm1t CkBAIC0zMiw3ICszMiw5IEBACiAjaW1wb3J0ICJUZXN0SW52b2NhdGlvbi5oIgogI2ltcG9ydCAi V2ViS2l0VGVzdFJ1bm5lclBhc3RlYm9hcmQuaCIKICNpbXBvcnQgPFdlYktpdC9XS1N0cmluZ0NG Lmg+Ci0jaW1wb3J0IDxtYWNoLW8vZHlsZC5oPiAKKyNpbXBvcnQgPFdlYktpdC9XS1VSTENGLmg+ CisjaW1wb3J0IDxXZWJLaXQvV0tVc2VyQ29udGVudEZpbHRlclJlZi5oPgorI2ltcG9ydCA8bWFj aC1vL2R5bGQuaD4KIAogQGludGVyZmFjZSBOU1NvdW5kIChEZXRhaWxzKQogKyAodm9pZClfc2V0 QWxlcnRUeXBlOihOU1VJbnRlZ2VyKWFsZXJ0VHlwZTsKQEAgLTk0LDYgKzk2LDI4IEBAIHZvaWQg VGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQ29uZmlndXJlVmlld0ZvclRlc3QoY29uc3QgVGVzdElu dm9jYXRpb24mIHRlc3QpCiAgICAgV0tEaWN0aW9uYXJ5U2V0SXRlbSh2aWV3T3B0aW9ucy5nZXQo KSwgdXNlUmVtb3RlTGF5ZXJUcmVlS2V5LmdldCgpLCB1c2VSZW1vdGVMYXllclRyZWVWYWx1ZS5n ZXQoKSk7CiAKICAgICBlbnN1cmVWaWV3U3VwcG9ydHNPcHRpb25zKHZpZXdPcHRpb25zLmdldCgp KTsKKworICAgIFdLVVJMUmVmIHVybCA9IHRlc3QudXJsKCk7CisgICAgV0tSZXRhaW5QdHI8V0tT dHJpbmdSZWY+IHVybFN0cmluZyA9IGFkb3B0V0soV0tVUkxDb3B5U3RyaW5nKHVybCkpOworCisg ICAgY2hhciB1cmxDU3RyaW5nWzE2Mzg0XTsKKyAgICBXS1N0cmluZ0dldFVURjhDU3RyaW5nKHVy bFN0cmluZy5nZXQoKSwgdXJsQ1N0cmluZywgMTYzODQpOworICAgIGlmICghc3Ryc3RyKHVybENT dHJpbmcsICJ1c2VyY29udGVudGZpbHRlci8iKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgUmV0 YWluUHRyPENGVVJMUmVmPiB0ZXN0VVJMID0gYWRvcHRDRihXS1VSTENvcHlDRlVSTChrQ0ZBbGxv Y2F0b3JEZWZhdWx0LCB1cmwpKTsKKyAgICBOU1VSTCAqZmlsdGVyVVJMID0gWyhOU1VSTCAqKXRl c3RVUkwuZ2V0KCkgVVJMQnlBcHBlbmRpbmdQYXRoRXh0ZW5zaW9uOkAianNvbiJdOworCisgICAg TlNTdHJpbmdFbmNvZGluZyBlbmNvZGluZzsKKyAgICBOU1N0cmluZyAqY29udGVudEZpbHRlclN0 cmluZyA9IFtOU1N0cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZlVSTDpmaWx0ZXJVUkwgdXNlZEVu Y29kaW5nOiZlbmNvZGluZyBlcnJvcjpOVUxMXTsKKyAgICBpZiAoIWNvbnRlbnRGaWx0ZXJTdHJp bmcpCisgICAgICAgIHJldHVybjsKKworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiBuYW1l ID0gYWRvcHRXSyhXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiVGVzdENvbnRlbnRGaWx0 ZXIiKSk7CisgICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IGNvbnRlbnRGaWx0ZXJTdHJpbmdX SyA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKENGU3RyaW5nUmVmKWNvbnRl bnRGaWx0ZXJTdHJpbmcpKTsKKyAgICBXS1JldGFpblB0cjxXS1VzZXJDb250ZW50RmlsdGVyUmVm PiBmaWx0ZXIgPSBhZG9wdFdLKFdLVXNlckNvbnRlbnRGaWx0ZXJDcmVhdGUobmFtZS5nZXQoKSwg Y29udGVudEZpbHRlclN0cmluZ1dLLmdldCgpKSk7CisKKyAgICBXS1BhZ2VHcm91cEFkZFVzZXJD b250ZW50RmlsdGVyKFdLUGFnZUdldFBhZ2VHcm91cChUZXN0Q29udHJvbGxlcjo6c2luZ2xldG9u KCkubWFpbldlYlZpZXcoKS0+cGFnZSgpKSwgZmlsdGVyLmdldCgpKTsKIH0KIAogdm9pZCBUZXN0 Q29udHJvbGxlcjo6cGxhdGZvcm1SdW5VbnRpbChib29sJiBkb25lLCBkb3VibGUgdGltZW91dCkK