188927 2018-08-24 12:55:38 -0700 [LayoutTests] results.html shows "no expected results" for text diff failures 2018-08-27 16:33:58 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=188690 InRadar P2 Normal --- 1 ross.kirsling simon.fraser ap jbedard lforschler simon.fraser webkit-bug-importer oldest_to_newest 1453545 0 ross.kirsling 2018-08-24 12:55:38 -0700 After r234993, WinCairo layout tests which have a failing text diff and no -expected.png show up as "had no expected results (probably new)": Before: https://build.webkit.org/results/WinCairo%2064-bit%20WKL%20Release%20(Tests)/r234991%20(1085)/results.html After: https://build.webkit.org/results/WinCairo%2064-bit%20WKL%20Release%20(Tests)/r234993%20(1086)/results.html Of course, the stdout for RWT still says "Unexpected text-only failures" for all of these: https://build.webkit.org/builders/WinCairo%2064-bit%20WKL%20Release%20%28Tests%29/builds/1086/steps/layout-test/logs/stdio 1454150 1 348219 simon.fraser 2018-08-27 15:38:35 -0700 Created attachment 348219 Patch 1454183 2 348219 ap 2018-08-27 16:19:16 -0700 Comment on attachment 348219 Patch I think that the code is structured quite confusingly, as function names don't make it clear which ones handle results from retries (like "TEXT MISSING" or "TEXT IMAGE"), and which don't. Given test coverage, it seems OK for now. 1454200 3 simon.fraser 2018-08-27 16:32:03 -0700 https://trac.webkit.org/r235409 1454203 4 webkit-bug-importer 2018-08-27 16:33:58 -0700 <rdar://problem/43775612> 348219 2018-08-27 15:38:35 -0700 2018-08-27 16:19:16 -0700 Patch bug-188927-20180827153835.patch text/plain 5974 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1Mzk5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggY2M0YWRlZTkyYjk5MDMyMDdkYjQ0 YWI3ZmYwNjRkMTcxMDg3NDJhMC4uMDk5YTBiYzg4YWZkZjNhMTNkYzRlYWQxZjRkMzE1YWY4ZDVl ZDIzNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA4LTI3ICBTaW1vbiBGcmFzZXIgIDxz aW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtMYXlvdXRUZXN0c10gcmVzdWx0cy5o dG1sIHNob3dzICJubyBleHBlY3RlZCByZXN1bHRzIiBmb3IgdGV4dCBkaWZmIGZhaWx1cmVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODg5MjcKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRo ZSByZXN1bHRzLmh0bWwgcmV3cml0ZSBjb25mdXNlZCAiaXMgbWlzc2luZyBhbGwgcmVzdWx0cyIg d2l0aCAiaXMgbWlzc2luZyBvbmUgdHlwZSBvZiByZXN1bHQiLAorICAgICAgICBjYXVzaW5nIHRl c3RzIHdpdGggYSBtaXNzaW5nIGltYWdlIHRvIHNob3cgYXMgdGVzdHMgd2l0aCBubyByZXN1bHRz LgorICAgICAgICAKKyAgICAgICAgRml4IGJ5IGNsYXJpZnlpbmcgdGhlIHR5cGVzIG9mICJtaXNz aW5nIi4KKworICAgICAgICAqIGZhc3QvaGFybmVzcy9mdWxsX3Jlc3VsdHMuanNvbjoKKyAgICAg ICAgKiBmYXN0L2hhcm5lc3MvcmVzdWx0cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogZmFzdC9o YXJuZXNzL3Jlc3VsdHMuaHRtbDoKKwogMjAxOC0wOC0yNyAgQW5keSBFc3RlcyAgPGFlc3Rlc0Bh cHBsZS5jb20+CiAKICAgICAgICAgW1BheW1lbnQgUmVxdWVzdF0gVXBkYXRlIHBheW1lbnQtcmVx dWVzdCB3ZWIgcGxhdGZvcm0gdGVzdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvaGFy bmVzcy9mdWxsX3Jlc3VsdHMuanNvbiBiL0xheW91dFRlc3RzL2Zhc3QvaGFybmVzcy9mdWxsX3Jl c3VsdHMuanNvbgppbmRleCBmNDQ2ZDkzYTRmNjMwNDk4MWU1ODkwODI3MDViZmYzMTY4NGJjYWI4 Li4zZTg1ZDJhMDBjM2RkYmY2OWI2Y2FlZjEzMmFkYmQ1M2ZkOTUyMDZiIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9mYXN0L2hhcm5lc3MvZnVsbF9yZXN1bHRzLmpzb24KKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9oYXJuZXNzL2Z1bGxfcmVzdWx0cy5qc29uCkBAIC04OCw2ICs4OCwxNiBAQCBBRERf UkVTVUxUUyh7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9LAor ICAgICAgICAiY3NzMSI6IHsKKyAgICAgICAgICAgICJmb250X3Byb3BlcnRpZXMiOiB7CisgICAg ICAgICAgICAgICAgImZvbnRfZmFtaWx5Lmh0bWwiOiB7CisgICAgICAgICAgICAgICAgICAgICJy ZXBvcnQiOiAiUkVHUkVTU0lPTiIsCisgICAgICAgICAgICAgICAgICAgICJleHBlY3RlZCI6ICJQ QVNTIiwKKyAgICAgICAgICAgICAgICAgICAgImFjdHVhbCI6ICJURVhUIE1JU1NJTkciLAorICAg ICAgICAgICAgICAgICAgICAiaXNfbWlzc2luZ19pbWFnZSI6IHRydWUKKyAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0sCiAgICAgICAgICJzdmciOiB7CiAgICAgICAg ICAgICAiYmF0aWsiOiB7CiAgICAgICAgICAgICAgICAgInNtYWxsRm9udHMuc3ZnIjogewpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNzL3Jlc3VsdHMtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNzL3Jlc3VsdHMtZXhwZWN0ZWQudHh0CmluZGV4IDc5ODA2 NjQ0MzUwNmM2OTI4MTcyYmZiZDJiZTQ2NGE0NGQ1M2ZlNTAuLmJkODJkM2Q5NmQ0YTY5MGJjMmUw ZDg3N2M1MDBlNDhlMjcxZTdmYjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvaGFybmVz cy9yZXN1bHRzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2hhcm5lc3MvcmVz dWx0cy1leHBlY3RlZC50eHQKQEAgLTksOSArOSwxMCBAQCBPdGhlciBjcmFzaGVzICgyKTogZmxh ZyBhbGwKIAogK0R1bXBSZW5kZXJUcmVlLTU0ODg4CWNyYXNoIGxvZwogK0R1bXBSZW5kZXJUcmVl LTU2ODA0CWNyYXNoIGxvZwotVGVzdHMgdGhhdCBmYWlsZWQgdGV4dC9waXhlbC9hdWRpbyBkaWZm ICgyKTogZmxhZyBhbGwKK1Rlc3RzIHRoYXQgZmFpbGVkIHRleHQvcGl4ZWwvYXVkaW8gZGlmZiAo Myk6IGZsYWcgYWxsCiAKICB0ZXN0IAlyZXN1bHRzCQlhY3R1YWwgZmFpbHVyZQlleHBlY3RlZCBm YWlsdXJlCWhpc3RvcnkKKytjc3MxL2ZvbnRfcHJvcGVydGllcy9mb250X2ZhbWlseS5odG1sCWV4 cGVjdGVkIGFjdHVhbCBkaWZmIHByZXR0eSBkaWZmCWltYWdlcwl0ZXh0IG1pc3NpbmcJCWhpc3Rv cnkKICtodHRwL3Rlc3RzL3N0b3JhZ2VBY2Nlc3MvcmVxdWVzdC1zdG9yYWdlLWFjY2Vzcy10b3At ZnJhbWUuaHRtbAlleHBlY3RlZCBhY3R1YWwgZGlmZiBwcmV0dHkgZGlmZgkJdGV4dAlwYXNzIHRp bWVvdXQJaGlzdG9yeQogK2h0dHAvd3B0L2NhY2hlLXN0b3JhZ2UvY2FjaGUtcHV0LWtleXMuaHR0 cHMuYW55Lndvcmtlci5odG1sCWV4cGVjdGVkIGFjdHVhbCBkaWZmIHByZXR0eSBkaWZmCQl0ZXh0 CXBhc3MJaGlzdG9yeQogVGVzdHMgdGhhdCBoYWQgbm8gZXhwZWN0ZWQgcmVzdWx0cyAocHJvYmFi bHkgbmV3KSAoMSk6IGZsYWcgYWxsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2hhcm5l c3MvcmVzdWx0cy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNzL3Jlc3VsdHMuaHRtbApp bmRleCBmMTM0MmJlNjY5OGYyZGYwODgxMTQyOTI1N2RiY2QyMWFiYjdjNzQxLi44MTcwOWUwZmNm ODc2YzEwYTk0NzAyMzIxMmYyN2Q2OTVjOWQzZWJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9m YXN0L2hhcm5lc3MvcmVzdWx0cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaGFybmVzcy9y ZXN1bHRzLmh0bWwKQEAgLTMyOSw3ICszMjksMTIgQEAgY2xhc3MgVGVzdFJlc3VsdAogICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9CiAgICAgCi0gICAgaXNNaXNzaW5nKCkKKyAgICBpc01pc3Np bmdBbGxSZXN1bHRzKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLmluZm8uYWN0dWFsID09 ICdNSVNTSU5HJzsKKyAgICB9CisgICAgCisgICAgaGFzTWlzc2luZ1Jlc3VsdCgpCiAgICAgewog ICAgICAgICByZXR1cm4gdGhpcy5pbmZvLmFjdHVhbC5pbmRleE9mKCdNSVNTSU5HJykgIT0gLTE7 CiAgICAgfQpAQCAtMzk5LDEwICs0MDQsMjAgQEAgY2xhc3MgVGVzdFJlc3VsdAogICAgICAgICBy ZXR1cm4gdGhpcy5pc1JlZlRlc3QoKSAmJiB0aGlzLmluZm8ucmVmdGVzdF90eXBlLmluZGV4T2Yo Jz09JykgIT0gLTE7CiAgICAgfQogICAgIAorICAgIGlzTWlzc2luZ1RleHQoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuaW5mby5pc19taXNzaW5nX3RleHQ7CisgICAgfQorCiAgICAgaXNN aXNzaW5nSW1hZ2UoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuaW5mby5pc19taXNzaW5n X2ltYWdlOwogICAgIH0KKworICAgIGlzTWlzc2luZ0F1ZGlvKCkKKyAgICB7CisgICAgICAgIHJl dHVybiB0aGlzLmluZm8uaXNfbWlzc2luZ19hdWRpbzsKKyAgICB9CiAgICAgCiAgICAgaGFzU3Rk RXJyKCkKICAgICB7CkBAIC00ODUsNyArNTAwLDcgQEAgY2xhc3MgVGVzdFJlc3VsdHMKICAgICAg ICAgaWYgKHRlc3RSZXN1bHQuaXNJbWFnZUZhaWx1cmUoKSkKICAgICAgICAgICAgIHRoaXMuaGFz SW1hZ2VGYWlsdXJlcyA9IHRydWU7CiAKLSAgICAgICAgaWYgKHRlc3RSZXN1bHQuaXNNaXNzaW5n KCkpIHsKKyAgICAgICAgaWYgKHRlc3RSZXN1bHQuaXNNaXNzaW5nQWxsUmVzdWx0cygpKSB7CiAg ICAgICAgICAgICAvLyBGSVhNRTogbWFrZSBzdXJlIHRoYXQgbmV3LXJ1bi13ZWJraXQtdGVzdHMg c3BpdHMgb3V0IGFuIC1hY3R1YWwudHh0IGZpbGUgZm9yIHRlc3RzIHdpdGggTUlTU0lORyByZXN1 bHRzLgogICAgICAgICAgICAgdGhpcy5taXNzaW5nUmVzdWx0cy5wdXNoKHRlc3RSZXN1bHQpOwog ICAgICAgICAgICAgcmV0dXJuOwpAQCAtMTE4Niw3ICsxMjAxLDcgQEAgY2xhc3MgRmFpbHVyZXNT ZWN0aW9uQnVpbGRlciBleHRlbmRzIFNlY3Rpb25CdWlsZGVyIHsKICAgICAgICAgaWYgKHRlc3RS ZXN1bHQuaXNBdWRpb0ZhaWx1cmUoKSkKICAgICAgICAgICAgIHRoaXMuYXBwZW5kQXVkaW9GYWls dXJlTGlua3ModGVzdFJlc3VsdCwgcmVzdWx0Q2VsbCk7CiAgICAgICAgICAgICAKLSAgICAgICAg aWYgKHRlc3RSZXN1bHQuaXNNaXNzaW5nKCkpCisgICAgICAgIGlmICh0ZXN0UmVzdWx0Lmhhc01p c3NpbmdSZXN1bHQoKSkKICAgICAgICAgICAgIHRoaXMuYXBwZW5kQWN0dWFsT25seUxpbmtzKHRl c3RSZXN1bHQsIHJlc3VsdENlbGwpOwogCiAgICAgICAgIGxldCBhY3R1YWxUb2tlbnMgPSB0ZXN0 UmVzdWx0LmluZm8uYWN0dWFsLnNwbGl0KC9ccysvKTsKQEAgLTEyMDgsNyArMTIyMyw3IEBAIGNs YXNzIEZhaWx1cmVzU2VjdGlvbkJ1aWxkZXIgZXh0ZW5kcyBTZWN0aW9uQnVpbGRlciB7CiAKICAg ICAgICAgaWYgKHRoaXMuX3Jlc3VsdHNDb250cm9sbGVyLnRlc3RSZXN1bHRzLnVzZXNFeHBlY3Rh dGlvbnNGaWxlKCkpIHsKICAgICAgICAgICAgIGxldCBleHBlY3RlZENlbGwgPSBkb2N1bWVudC5j cmVhdGVFbGVtZW50KCd0ZCcpOwotICAgICAgICAgICAgZXhwZWN0ZWRDZWxsLnRleHRDb250ZW50 ID0gdGVzdFJlc3VsdC5pc01pc3NpbmcoKSA/ICcnIDogdGVzdFJlc3VsdC5pbmZvLmV4cGVjdGVk OworICAgICAgICAgICAgZXhwZWN0ZWRDZWxsLnRleHRDb250ZW50ID0gdGVzdFJlc3VsdC5oYXNN aXNzaW5nUmVzdWx0KCkgPyAnJyA6IHRlc3RSZXN1bHQuaW5mby5leHBlY3RlZDsKICAgICAgICAg ICAgIHJvdy5hcHBlbmRDaGlsZChleHBlY3RlZENlbGwpOwogICAgICAgICB9CiAKQEAgLTEyMzUs MTAgKzEyNTAsMTAgQEAgY2xhc3MgRmFpbHVyZXNTZWN0aW9uQnVpbGRlciBleHRlbmRzIFNlY3Rp b25CdWlsZGVyIHsKICAgICBhcHBlbmRBY3R1YWxPbmx5TGlua3ModGVzdFJlc3VsdCwgY2VsbCkK ICAgICB7CiAgICAgICAgIGxldCBwcmVmaXggPSBVdGlscy5zdHJpcEV4dGVuc2lvbih0ZXN0UmVz dWx0Lm5hbWUpOwotICAgICAgICBpZiAodGVzdFJlc3VsdC5pbmZvLmlzX21pc3NpbmdfYXVkaW8p CisgICAgICAgIGlmICh0ZXN0UmVzdWx0LmlzTWlzc2luZ0F1ZGlvKCkpCiAgICAgICAgICAgICBj ZWxsLmlubmVySFRNTCArPSBUZXN0UmVzdWx0c0NvbnRyb2xsZXIucmVzdWx0TGluayhwcmVmaXgs ICctYWN0dWFsLndhdicsICdhdWRpbyByZXN1bHQnKTsKIAotICAgICAgICBpZiAodGVzdFJlc3Vs dC5pbmZvLmlzX21pc3NpbmdfdGV4dCkKKyAgICAgICAgaWYgKHRlc3RSZXN1bHQuaXNNaXNzaW5n VGV4dCgpKQogICAgICAgICAgICAgY2VsbC5pbm5lckhUTUwgKz0gVGVzdFJlc3VsdHNDb250cm9s bGVyLnJlc3VsdExpbmsocHJlZml4LCAnLWFjdHVhbC50eHQnLCAncmVzdWx0Jyk7CiAgICAgfQog CkBAIC0xMjY3LDcgKzEyODIsNyBAQCBjbGFzcyBGYWlsdXJlc1NlY3Rpb25CdWlsZGVyIGV4dGVu ZHMgU2VjdGlvbkJ1aWxkZXIgewogICAgICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIAot ICAgICAgICBpZiAodGVzdFJlc3VsdC5pc01pc3NpbmcoKSAmJiB0ZXN0UmVzdWx0LmlzTWlzc2lu Z0ltYWdlKCkpCisgICAgICAgIGlmICh0ZXN0UmVzdWx0Lmhhc01pc3NpbmdSZXN1bHQoKSAmJiB0 ZXN0UmVzdWx0LmlzTWlzc2luZ0ltYWdlKCkpCiAgICAgICAgICAgICByZXN1bHQgKz0gVGVzdFJl c3VsdHNDb250cm9sbGVyLnJlc3VsdExpbmsodGVzdFByZWZpeCwgJy1hY3R1YWwucG5nJywgJ3Bu ZyByZXN1bHQnKTsKICAgICAgICAgCiAgICAgICAgIHJldHVybiByZXN1bHQ7Cg==