194846 2019-02-19 18:02:58 -0800 [WinCairo] Enable wk1/wk2 suffix for platform search path. 2019-02-22 20:07:25 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke bfulgham commit-queue don.olmstead ews-watchlist fujii glenn lforschler pvollan ross.kirsling webkit-bug-importer youennf oldest_to_newest 1507953 0 basuke 2019-02-19 18:02:58 -0800 Currently WinCairo doesn't look into wincairo-wk2 or wincairo-wk1 directory. This patch allows that to enable WebKit or WebKit Legacy specific expectations. 1507956 1 362466 basuke 2019-02-19 18:21:11 -0800 Created attachment 362466 Patch 1507986 2 362466 fujii 2019-02-19 20:13:56 -0800 Comment on attachment 362466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362466&action=review > LayoutTests/platform/wincairo-wk1/TestExpectations:16 > +http/tests/websocket/tests/hybi/network-process-crash-error.html [ Skip ] It seems that all WK1 TestExpectations has this line, e.g. ios-wk1/TestExpectations and mac-wk1/TestExpectations. In such case, this line should be moved into the top TestExpectations, and platform/wk2/TestExpectations should have the following line to enable this test only in WK2. > http/tests/websocket/tests/hybi/network-process-crash-error.html [ Pass ] WinCairo WK2 takes platform/wk2/TestExpectations into account. 1507996 3 362466 fujii 2019-02-19 20:52:27 -0800 Comment on attachment 362466 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=362466&action=review > Tools/Scripts/webkitpy/port/win.py:503 > + for version in versions: I don't like this code because this is too generic even though this is a WinCairoPort's method. It seems that you are following mac.py. Actually mac port is maintianing following TestExpectations. mac mac-highsierra mac-highsierra-wk1 mac-sierra mac-sierra-wk1 mac-sierra-wk2 mac-wk1 mac-wk2 However, WinCairo port doesn't have a plan to maintain Windows version specific TestExpectations. 1508016 4 basuke 2019-02-19 23:54:02 -0800 (In reply to Fujii Hironori from comment #2) > Comment on attachment 362466 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=362466&action=review > > > LayoutTests/platform/wincairo-wk1/TestExpectations:16 > > +http/tests/websocket/tests/hybi/network-process-crash-error.html [ Skip ] > > It seems that all WK1 TestExpectations has this line, e.g. > ios-wk1/TestExpectations and mac-wk1/TestExpectations. > In such case, this line should be moved into the top TestExpectations, and > platform/wk2/TestExpectations should have the following line to enable this > test only in WK2. > > http/tests/websocket/tests/hybi/network-process-crash-error.html [ Pass ] > > WinCairo WK2 takes platform/wk2/TestExpectations into account. That's not the point of this patch. This patch just try to enable wk1/wk2 platform variation to WinCairo. That purpose should be on separate patch. 1508019 5 basuke 2019-02-19 23:59:47 -0800 (In reply to Fujii Hironori from comment #3) > Comment on attachment 362466 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=362466&action=review > > > Tools/Scripts/webkitpy/port/win.py:503 > > + for version in versions: > > I don't like this code because this is too generic even though this is a > WinCairoPort's method. I'm sorry, I can't understand. This is the basis of structured programming that once the context is defined, it shouldn't be verbose. In this context, the method is implemented in WinCairoPort. In the method, version is meant to be for WinCairo. > It seems that you are following mac.py. > Actually mac port is maintianing following TestExpectations. > > mac > mac-highsierra > mac-highsierra-wk1 > mac-sierra > mac-sierra-wk1 > mac-sierra-wk2 > mac-wk1 > mac-wk2 > > However, WinCairo port doesn't have a plan to maintain Windows version > specific TestExpectations. No, we already support wincairo-win10, wincairo-win7 or such. Again, what's your point? 1508031 6 fujii 2019-02-20 01:38:56 -0800 (In reply to Basuke Suzuki from comment #5) > > However, WinCairo port doesn't have a plan to maintain Windows version > > specific TestExpectations. > > No, we already support wincairo-win10, wincairo-win7 or such. Again, what's > your point? What do you mean? No such sub directories (wincairo-win10 and wincairo-win7) in the following directory: https://trac.webkit.org/browser/webkit/trunk/LayoutTests/platform 1508037 7 fujii 2019-02-20 02:27:18 -0800 I understand what you mean. You mean origianl WinCairoPort class already supports wincairo-win10 and wincairo-win7. That's right. But, I'm talking about maintaining TestExpectations. 1508067 8 basuke 2019-02-20 07:12:35 -0800 (In reply to Fujii Hironori from comment #7) > I understand what you mean. You mean origianl WinCairoPort class already > supports wincairo-win10 and wincairo-win7. That's right. > But, I'm talking about maintaining TestExpectations. We don't have to maintain whole available expectations. This separation makes the accuracy of TestExpectations better. I don't like the test with [Pass Failure] because of the difference between WebKit and Legacy. Same thing for Windows version. What if somebody found a bug when it fails on Windows 7? We don't plan to maintain that, but the guy complains. With the version separation, we simply open a new bug for that guy, add a line to wincairo-win7/TestExpectations with that bug id and that's it. I think that's why both wk1/wk2 separation and Windows version separation are good to have to maintain TextExpectations healthy. What do you think? 1509102 9 362466 don.olmstead 2019-02-22 12:08:24 -0800 Comment on attachment 362466 Patch r=me We can just remove this when we fully switch to WebKitTestRunner. 1509310 10 362466 basuke 2019-02-22 19:40:44 -0800 Comment on attachment 362466 Patch Thanks! 1509312 11 362466 commit-queue 2019-02-22 20:06:00 -0800 Comment on attachment 362466 Patch Clearing flags on attachment: 362466 Committed r241979: <https://trac.webkit.org/changeset/241979> 1509313 12 commit-queue 2019-02-22 20:06:02 -0800 All reviewed patches have been landed. Closing bug. 1509314 13 webkit-bug-importer 2019-02-22 20:07:25 -0800 <rdar://problem/48333562> 362466 2019-02-19 18:21:11 -0800 2019-02-22 20:06:00 -0800 Patch 194846.diff text/plain 5306 basuke ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxNzUzYzY3NjBhZC4uNTdjYTJhNWQ4YjcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxOS0wMi0xOSAgQmFzdWtlIFN1enVraSAgPGJhc3VrZS5zdXp1a2lAc29ueS5jb20+CisKKyAg ICAgICAgW1dpbkNhaXJvXSBFbmFibGUgd2sxL3drMiBzdWZmaXggZm9yIHBsYXRmb3JtIHNlYXJj aCBwYXRoLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk0ODQ2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkZWQgV2ViS2l0TGVnYWN5IHNwZWNpZmljIFRlc3RFeHBlY3RhdGlvbnMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS93aW5jYWlyby13azEvVGVzdEV4cGVjdGF0aW9uczogQWRkZWQuCisgICAgICAg ICogcGxhdGZvcm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxOS0wMi0xOSAgUnlv c3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNDA5 MDkpOiBSZWxlYXNlIGFzc2VydGlvbiBpbiBGcmFtZUxvYWRlcjo6bG9hZFBvc3RSZXF1ZXN0IHdo ZW4gb3BlbmluZyBuZXcgd2luZG93CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93 aW5jYWlyby13azEvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNh aXJvLXdrMS9UZXN0RXhwZWN0YXRpb25zCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwLi4yNzA3MDYyNGQxNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRm b3JtL3dpbmNhaXJvLXdrMS9UZXN0RXhwZWN0YXRpb25zCkBAIC0wLDAgKzEsMTYgQEAKKyMgVGhp cyBmaWxlIHNob3VsZCBjb250YWluIGVudHJpZXMgZm9yIGV4cGVjdGF0aW9ucyB0aGF0IGFyZSBz cGVjaWZpYworIyB0byB0aGUgQXBwbGUgTWFjIHBvcnQgcnVubmluZyBXZWJLaXQxIChEdW1wUmVu ZGVyVHJlZSkKKworIy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLworIyBQbGF0Zm9y bS1zcGVjaWZpYyB0ZXN0cy4gU2tpcHBlZCBnbG9iYWxseSwgdGhlbiByZS1lbmFibGVkIGhlcmUu CisjLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisKKworIy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLworIyBFbmQgcGxhdGZvcm0tc3BlY2lmaWMgZGlyZWN0b3JpZXMu CisjLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCisKKyMgRmFpbHVyZXMgb24gV2Vi S2l0IExlZ2FjeQorCisjIFRoZXJlIGlzIG5vdCBOZXR3b3JrUHJvY2VzcyBpbiBXSzEsIHNvIGl0 IGNhbid0IGNyYXNoLgoraHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9uZXR3b3JrLXBy b2Nlc3MtY3Jhc2gtZXJyb3IuaHRtbCBbIFNraXAgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vd2luY2Fpcm8vVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L3dpbmNhaXJvL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNWExNjhkZmFmYzEuLjIwNzAyNTFiNzVm IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW5jYWlyby9UZXN0RXhwZWN0YXRp b25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbmNhaXJvL1Rlc3RFeHBlY3RhdGlvbnMK QEAgLTk1NSw5ICs5NTUsNiBAQCBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3dlYnNv Y2tldC1jb29raWUtb3ZlcndyaXRlLWJlaGF2aW9yLmh0bWwgWyBQYXNzCiBodHRwL3Rlc3RzL3dl YnNvY2tldC90ZXN0cy9oeWJpL3dvcmtlcnMvY2xvc2UuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCiBo dHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3dvcmtlcnMvd29ya2VyLXJlbG9hZC5odG1s IFsgVGltZW91dCBQYXNzIF0KIAotIyBUaGVyZSBpcyBub3QgTmV0d29ya1Byb2Nlc3MgaW4gV0sx LCBzbyBpdCBjYW4ndCBjcmFzaC4KLWh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvbmV0 d29yay1wcm9jZXNzLWNyYXNoLWVycm9yLmh0bWwgWyBTa2lwIF0KLQogaHR0cC90ZXN0cy93b3Jr ZXJzL3NlcnZpY2UgWyBTa2lwIF0KIGh0dHAvdGVzdHMvd29ya2Vycy93b3JrZXItcmVkaXJlY3Qu aHRtbCBbIEZhaWx1cmUgXQogCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggMjg4ZTlmYTRkOWYuLmIxOTZmOWQ1OTM2IDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTkt MDItMTkgIEJhc3VrZSBTdXp1a2kgIDxiYXN1a2Uuc3V6dWtpQHNvbnkuY29tPgorCisgICAgICAg IFtXaW5DYWlyb10gRW5hYmxlIHdrMS93azIgc3VmZml4IGZvciBwbGF0Zm9ybSBzZWFyY2ggcGF0 aC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDg0 NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGVk IF9zZWFyY2hfcGF0aHMoKSBhbmQgX3BvcnRfc3BlY2lmaWNfZXhwZWN0YXRpb25zX2ZpbGVzKCkg Zm9yCisgICAgICAgIFdpbkNhaXJvUG9ydC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC93aW4ucHk6CisgICAgICAgIChXaW5DYWlyb1BvcnQuZGVmYXVsdF9iYXNlbGluZV9zZWFy Y2hfcGF0aCk6CisgICAgICAgIChXaW5DYWlyb1BvcnQpOgorICAgICAgICAoV2luQ2Fpcm9Qb3J0 Ll9wb3J0X3NwZWNpZmljX2V4cGVjdGF0aW9uc19maWxlcyk6CisgICAgICAgIChXaW5DYWlyb1Bv cnQuX3NlYXJjaF9wYXRocyk6CisKIDIwMTktMDItMTkgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtGbG9hdHNdIFJlbW92ZSByZWR1bmRhbnQgaW50ZXJz ZWN0aW5nIGxvZ2ljCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2lu LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQppbmRleCBlMDBjMmE0ZmU0 MC4uMzU4ZmZkZDM1N2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93 aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQpAQCAtNDgxLDEy ICs0ODEsMzEgQEAgY2xhc3MgV2luQ2Fpcm9Qb3J0KFdpblBvcnQpOgogICAgIERFRkFVTFRfQVJD SElURUNUVVJFID0gJ3g4Nl82NCcKIAogICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9w YXRoKHNlbGYsICoqa3dhcmdzKToKKyAgICAgICAgcmV0dXJuIG1hcChzZWxmLl93ZWJraXRfYmFz ZWxpbmVfcGF0aCwgc2VsZi5fc2VhcmNoX3BhdGhzKCkpCisKKyAgICBkZWYgX3BvcnRfc3BlY2lm aWNfZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYsICoqa3dhcmdzKToKKyAgICAgICAgcmV0dXJuIG1h cChsYW1iZGEgeDogc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9w YXRoKHgpLCAnVGVzdEV4cGVjdGF0aW9ucycpLCByZXZlcnNlZChzZWxmLl9zZWFyY2hfcGF0aHMo KSkpCisKKyAgICBkZWYgX3NlYXJjaF9wYXRocyhzZWxmKToKKyAgICAgICAgcGF0aHMgPSBbXQog ICAgICAgICB2ZXJzaW9uX25hbWVfbWFwID0gVmVyc2lvbk5hbWVNYXAubWFwKHNlbGYuaG9zdC5w bGF0Zm9ybSkKICAgICAgICAgaWYgc2VsZi5fb3NfdmVyc2lvbiA8IHNlbGYuVkVSU0lPTl9NSU4g b3Igc2VsZi5fb3NfdmVyc2lvbiA+IHNlbGYuVkVSU0lPTl9NQVg6Ci0gICAgICAgICAgICBmYWxs YmFja192ZXJzaW9ucyA9IFtzZWxmLl9vc192ZXJzaW9uXQorICAgICAgICAgICAgdmVyc2lvbnMg PSBbc2VsZi5fb3NfdmVyc2lvbl0KICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNvcnRlZF92 ZXJzaW9ucyA9IHNvcnRlZCh2ZXJzaW9uX25hbWVfbWFwLm1hcHBpbmdfZm9yX3BsYXRmb3JtKHBs YXRmb3JtPXNlbGYucG9ydF9uYW1lKS52YWx1ZXMoKSkKLSAgICAgICAgICAgIGZhbGxiYWNrX3Zl cnNpb25zID0gc29ydGVkX3ZlcnNpb25zW3NvcnRlZF92ZXJzaW9ucy5pbmRleChzZWxmLl9vc192 ZXJzaW9uKTpdCi0gICAgICAgIGZhbGxiYWNrX25hbWVzID0gWyd3aW5jYWlyby0nICsgdmVyc2lv bl9uYW1lX21hcC50b19uYW1lKHZlcnNpb24sIHBsYXRmb3JtPXNlbGYucG9ydF9uYW1lKS5sb3dl cigpLnJlcGxhY2UoJyAnLCAnJykgZm9yIHZlcnNpb24gaW4gZmFsbGJhY2tfdmVyc2lvbnNdCi0g ICAgICAgIGZhbGxiYWNrX25hbWVzLmFwcGVuZCgnd2luY2Fpcm8nKQotICAgICAgICByZXR1cm4g bWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBmYWxsYmFja19uYW1lcykKKyAgICAgICAg ICAgIHZlcnNpb25zID0gc29ydGVkX3ZlcnNpb25zW3NvcnRlZF92ZXJzaW9ucy5pbmRleChzZWxm Ll9vc192ZXJzaW9uKTpdCisKKyAgICAgICAgbm9ybWFsaXplID0gbGFtYmRhIHZlcnNpb246IHZl cnNpb24ubG93ZXIoKS5yZXBsYWNlKCcgJywgJycpCisgICAgICAgIHRvX25hbWUgPSBsYW1iZGEg dmVyc2lvbjogdmVyc2lvbl9uYW1lX21hcC50b19uYW1lKHZlcnNpb24sIHBsYXRmb3JtPXNlbGYu cG9ydF9uYW1lKQorCisgICAgICAgIHdrX3ZlcnNpb24gPSAnd2syJyBpZiBzZWxmLmdldF9vcHRp b24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpIGVsc2UgJ3drMScKKworICAgICAgICBmb3IgdmVyc2lv biBpbiB2ZXJzaW9uczoKKyAgICAgICAgICAgIG5hbWUgPSBzZWxmLnBvcnRfbmFtZSArICctJyAr IG5vcm1hbGl6ZSh0b19uYW1lKHZlcnNpb24pKQorICAgICAgICAgICAgcGF0aHMuYXBwZW5kKG5h bWUgKyAnLScgKyB3a192ZXJzaW9uKQorICAgICAgICAgICAgcGF0aHMuYXBwZW5kKG5hbWUpCisK KyAgICAgICAgcGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1lICsgJy0nICsgd2tfdmVyc2lvbikK KyAgICAgICAgcGF0aHMuYXBwZW5kKHNlbGYucG9ydF9uYW1lKQorCisgICAgICAgIHJldHVybiBw YXRocwo=