207223 2020-02-04 13:45:39 -0800 [WinCairo] Set up fonts for layout tests for test bot image 2020-02-05 20:46:13 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 stephan.szabo webkit-unassigned commit-queue don.olmstead ews-watchlist fujii glenn jbedard webkit-bug-importer yoshiaki.jitsukawa oldest_to_newest 1614704 0 stephan.szabo 2020-02-04 13:45:39 -0800 Add code to the wincairo port to set up (and remove) the fonts in the appropriate test runner directory before and after test run. Make this so that it can be turned on for the webkitdev/buildbot images that were having problems due to ahem not being properly registered but not default to keep existing behavior as close as possible. 1614707 1 389700 stephan.szabo 2020-02-04 13:50:39 -0800 Created attachment 389700 Patch Checking to see if the ctypes additions messes up style check or any other ports. 1614750 2 389700 stephan.szabo 2020-02-04 14:34:50 -0800 Comment on attachment 389700 Patch As most have come back okay... This sets up the fonts in the directory under the current test runner. This reduced on a manual run in the buildbot image the text-only failures from 620 to 310 and image-only failures from 118 to 17. 1614895 3 fujii 2020-02-04 18:34:43 -0800 I don't think this is WebKit's right way to do this. See other ports Bug 42153 – Activate test fonts for layout tests in WebKitTestRunner (on Mac) GTK port: r87760 https://trac.webkit.org/browser/webkit/trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp#L326 1614904 4 stephan.szabo 2020-02-04 19:25:16 -0800 (In reply to Fujii Hironori from comment #3) > I don't think this is WebKit's right way to do this. > See other ports > > Bug 42153 – Activate test fonts for layout tests in WebKitTestRunner (on Mac) > GTK port: r87760 > https://trac.webkit.org/browser/webkit/trunk/Tools/DumpRenderTree/win/ > DumpRenderTree.cpp#L326 To prevent an extra cycle with a day apart, looking at the GTK one, would you find a version where it got the effective equivalent of the FONTS_CONF_DIR from environment acceptable (with unset being don't do anything)? I'm a little worried about burning that in at compile time. 1614990 5 fujii 2020-02-05 03:16:54 -0800 I don't understand. Why does FONTS_CONF_DIR matter? WinCairo doesn't use FontConfig. 1615121 6 stephan.szabo 2020-02-05 10:32:54 -0800 Ah, sorry to be unclear, it's also used as part of the path which is used to refer to the ttf files. For example: https://github.com/WebKit/webkit/blob/master/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp#L118 https://github.com/WebKit/webkit/blob/master/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp#L135 --- I was preferring something like the win DRT environment variable WEBKIT_TESTFONTS for finding the ttf files at runtime. So, the first part of the question was whether that seemed acceptable to you. The second part of the question was whether not having the variable set could be an early out and not try to find/set up the fonts. DRT has a fallback to a exePath() + DumpRenderTree.resources if the environment variable is not set. 1615354 7 389892 stephan.szabo 2020-02-05 15:51:35 -0800 Created attachment 389892 Patch 1615505 8 389892 fujii 2020-02-05 19:26:43 -0800 Comment on attachment 389892 Patch LGTM 1615522 9 389892 commit-queue 2020-02-05 20:45:04 -0800 Comment on attachment 389892 Patch Clearing flags on attachment: 389892 Committed r255900: <https://trac.webkit.org/changeset/255900> 1615523 10 commit-queue 2020-02-05 20:45:06 -0800 All reviewed patches have been landed. Closing bug. 1615524 11 webkit-bug-importer 2020-02-05 20:46:13 -0800 <rdar://problem/59213021> 389700 2020-02-04 13:50:39 -0800 2020-02-05 15:51:35 -0800 Patch 207223.1.diff text/plain 2720 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhMGVh YjBjYzBmNC4uMmNkODRlODIzZjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAyMC0wMi0wNCAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CisKKyAgICAgICAgW1dpbkNhaXJvXSBTZXQgdXAg Zm9udHMgZm9yIGxheW91dCB0ZXN0cyBmb3IgdGVzdCBib3QgaW1hZ2UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzIyMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtXaW5DYWlyb10gU2V0IHVwIGZvbnRz IGZvciB0ZXN0cworCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weToKKyAg ICAgICAgKFdpbkNhaXJvUG9ydC5fZ2V0X3Rlc3RfZm9udHMpOgorICAgICAgICBHZXQgdGhlIGZv bnRzIGZyb20gdW5kZXIgdGhlIHRvb2xzIGRpcmVjdG9yeSBmb3IgdGhlIHBhcnRpY3VsYXIKKyAg ICAgICAgdGVzdCBydW5uZXIgYmVpbmcgdXNlZCAoZWl0aGVyIERSVCBvciBXS1RSKQorICAgICAg ICAoV2luQ2Fpcm9Qb3J0Ll9nZXRfdGVzdF9mb250cy5faXNfdHRmKToKKyAgICAgICAgKFdpbkNh aXJvUG9ydCk6CisgICAgICAgIChXaW5DYWlyb1BvcnQuc2V0dXBfdGVzdF9ydW4pOgorICAgICAg ICBBZGQgcmVnaXN0cmF0aW9uIG9mIHRoZSBmb250cyB3aXRoIGdkaTMyJ3MgQWRkRm9udFJlc291 cmNlVworICAgICAgICAoV2luQ2Fpcm9Qb3J0LmNsZWFuX3VwX3Rlc3RfcnVuKToKKyAgICAgICAg QWRkIHJlbW92YWwgb2YgdGhlIGZvbnRzIHdpdGggZ2RpMzIncyBSZW1vdmVGb250UmVzb3VyY2VX CisKIDIwMjAtMDEtMjggIFl1c3VrZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAg ICAgICBbSlNDXSBHaXZlIHVwIElDIHdoZW4gdW5rbm93biBzdHJ1Y3R1cmUgdHJhbnNpdGlvbiBo YXBwZW5zCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2luLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQppbmRleCA0OGM5YjEyMjhkMy4uYjA5 YTZlMjZkN2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93aW4ucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dpbi5weQpAQCAtMjgsNiArMjgsNyBA QAogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgYXRleGl0CitpbXBvcnQgY3R5cGVzCiBpbXBvcnQg Z2xvYgogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBvcwpAQCAtNTAzLDYgKzUwNCwzMSBAQCBjbGFz cyBXaW5DYWlyb1BvcnQoV2luUG9ydCk6CiAgICAgICAgIGNvbmZpZ3VyYXRpb25bJ3BsYXRmb3Jt J10gPSBzZWxmLnBvcnRfbmFtZQogICAgICAgICByZXR1cm4gY29uZmlndXJhdGlvbgogCisgICAg ZGVmIF9nZXRfdGVzdF9mb250cyhzZWxmKToKKyAgICAgICAgZGVmIF9pc190dGYoZmlsZXN5c3Rl bSwgZGlycGF0aCwgZmlsZW5hbWUpOgorICAgICAgICAgICAgYmFzZSwgZXh0ID0gZmlsZXN5c3Rl bS5zcGxpdGV4dChmaWxlbmFtZSkKKyAgICAgICAgICAgIHJldHVybiBleHQubG93ZXIoKSA9PSAi LnR0ZiIKKworICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicp OgorICAgICAgICAgICAgcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbigiVG9vbHMiLCAiV2Vi S2l0VGVzdFJ1bm5lciIsICJGb250cyIpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBwYXRo ID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKCJUb29scyIsICJEdW1wUmVuZGVyVHJlZSIsICJGb250 cyIpCisgICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmZpbGVzX3VuZGVyKHBhdGgsIFtd LCBfaXNfdHRmKQorCisgICAgZGVmIHNldHVwX3Rlc3RfcnVuKHNlbGYsIGRldmljZV90eXBlPU5v bmUpOgorICAgICAgICBpZiAnV0VCS0lUX0xBWU9VVF9URVNUU19TRVRVUF9GT05UUycgaW4gb3Mu ZW52aXJvbjoKKyAgICAgICAgICAgIGV4dHJhX2ZvbnRzID0gc2VsZi5fZ2V0X3Rlc3RfZm9udHMo KQorICAgICAgICAgICAgZm9yIGZvbnQgaW4gZXh0cmFfZm9udHM6CisgICAgICAgICAgICAgICAg Y3R5cGVzLndpbmRsbC5nZGkzMi5BZGRGb250UmVzb3VyY2VXKGN0eXBlcy5jX3djaGFyX3AoZm9u dCkpCisgICAgICAgIHN1cGVyKFdpbkNhaXJvUG9ydCwgc2VsZikuc2V0dXBfdGVzdF9ydW4oZGV2 aWNlX3R5cGUpCisKKyAgICBkZWYgY2xlYW5fdXBfdGVzdF9ydW4oc2VsZik6CisgICAgICAgIGlm ICdXRUJLSVRfTEFZT1VUX1RFU1RTX1NFVFVQX0ZPTlRTJyBpbiBvcy5lbnZpcm9uOgorICAgICAg ICAgICAgZXh0cmFfZm9udHMgPSBzZWxmLl9nZXRfdGVzdF9mb250cygpCisgICAgICAgICAgICBm b3IgZm9udCBpbiBleHRyYV9mb250czoKKyAgICAgICAgICAgICAgICBjdHlwZXMud2luZGxsLmdk aTMyLlJlbW92ZUZvbnRSZXNvdXJjZVcoY3R5cGVzLmNfd2NoYXJfcChmb250KSkKKyAgICAgICAg c3VwZXIoV2luQ2Fpcm9Qb3J0LCBzZWxmKS5jbGVhbl91cF90ZXN0X3J1bigpCisKIAogY2xhc3Mg RlRXUG9ydChXaW5Qb3J0KToKICAgICBwb3J0X25hbWUgPSAiZnR3Igo= 389892 2020-02-05 15:51:35 -0800 2020-02-05 20:45:04 -0800 Patch 207223.2.diff text/plain 2499 stephan.szabo ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhMGVh YjBjYzBmNC4uNjEwZWY0Njg1ZGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMC0wMi0wNSAgU3RlcGhhbiBTemFi byAgPHN0ZXBoYW4uc3phYm9Ac29ueS5jb20+CisKKyAgICAgICAgW1dpbkNhaXJvXSBTZXQgdXAg Zm9udHMgZm9yIGxheW91dCB0ZXN0cyBmb3IgdGVzdCBib3QgaW1hZ2UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzIyMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS93aW4vQWN0aXZhdGVGb250c1dpbi5jcHA6CisgICAgICAgICAgSW1wbGVtZW50 IGFjdGl2YXRlRm9udHMgdG8gbG9hZCBmb250cyBmb3IgdGVzdAorCiAyMDIwLTAxLTI4ICBZdXN1 a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gR2l2ZSB1cCBJ QyB3aGVuIHVua25vd24gc3RydWN0dXJlIHRyYW5zaXRpb24gaGFwcGVucwpkaWZmIC0tZ2l0IGEv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS93aW4vQWN0aXZhdGVGb250c1dp bi5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL3dpbi9BY3RpdmF0 ZUZvbnRzV2luLmNwcAppbmRleCAyNmMxNmZjZTI0YS4uOTYyZWQxMTZiOTUgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvd2luL0FjdGl2YXRlRm9udHNX aW4uY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvd2luL0Fj dGl2YXRlRm9udHNXaW4uY3BwCkBAIC0yNiwxMCArMjYsNTcgQEAKICNpbmNsdWRlICJjb25maWcu aCIKICNpbmNsdWRlICJBY3RpdmF0ZUZvbnRzLmgiCiAKKyNpbmNsdWRlIDxzdHJpbmc+CisjaW5j bHVkZSA8dmVjdG9yPgorI2luY2x1ZGUgPHdpbmRvd3MuaD4KKwogbmFtZXNwYWNlIFdUUiB7CiAK K3N0YXRpYyBjb25zdCB3Y2hhcl90KiBmb250c0Vudmlyb25tZW50VmFyaWFibGUgPSBMIldFQktJ VF9URVNURk9OVFMiOworCitzdGF0aWMgY29uc3Qgc3RkOjp3c3RyaW5nJiBmb250c1BhdGgoKQor eworICAgIHN0YXRpYyBzdGQ6OndzdHJpbmcgcGF0aDsKKyAgICBzdGF0aWMgYm9vbCBpbml0aWFs aXplZDsKKworICAgIGlmIChpbml0aWFsaXplZCkKKyAgICAgICAgcmV0dXJuIHBhdGg7CisgICAg aW5pdGlhbGl6ZWQgPSB0cnVlOworCisgICAgRFdPUkQgc2l6ZSA9IEdldEVudmlyb25tZW50VmFy aWFibGVXKGZvbnRzRW52aXJvbm1lbnRWYXJpYWJsZSwgMCwgMCk7CisgICAgc3RkOjp2ZWN0b3I8 d2NoYXJfdD4gYnVmZmVyKHNpemUpOworICAgIGlmIChHZXRFbnZpcm9ubWVudFZhcmlhYmxlVyhm b250c0Vudmlyb25tZW50VmFyaWFibGUsIGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5zaXplKCkpKSB7 CisgICAgICAgIHBhdGggPSBidWZmZXIuZGF0YSgpOworICAgICAgICBpZiAocGF0aFtwYXRoLmxl bmd0aCgpIC0gMV0gIT0gJ1xcJykKKyAgICAgICAgICAgIHBhdGguYXBwZW5kKEwiXFwiKTsKKyAg ICB9CisKKyAgICByZXR1cm4gcGF0aDsKK30KKwogdm9pZCBhY3RpdmF0ZUZvbnRzKCkKIHsKKyAg ICBzdGF0aWMgY29uc3Qgd2NoYXJfdCogZm9udEZpbGVuYW1lc1tdID0geworICAgICAgICBMIkFI RU1fX19fLlRURiIsCisgICAgICAgIEwiV2ViS2l0V2VpZ2h0V2F0Y2hlcjEwMC50dGYiLAorICAg ICAgICBMIldlYktpdFdlaWdodFdhdGNoZXIyMDAudHRmIiwKKyAgICAgICAgTCJXZWJLaXRXZWln aHRXYXRjaGVyMzAwLnR0ZiIsCisgICAgICAgIEwiV2ViS2l0V2VpZ2h0V2F0Y2hlcjQwMC50dGYi LAorICAgICAgICBMIldlYktpdFdlaWdodFdhdGNoZXI1MDAudHRmIiwKKyAgICAgICAgTCJXZWJL aXRXZWlnaHRXYXRjaGVyNjAwLnR0ZiIsCisgICAgICAgIEwiV2ViS2l0V2VpZ2h0V2F0Y2hlcjcw MC50dGYiLAorICAgICAgICBMIldlYktpdFdlaWdodFdhdGNoZXI4MDAudHRmIiwKKyAgICAgICAg TCJXZWJLaXRXZWlnaHRXYXRjaGVyOTAwLnR0ZiIsCisgICAgICAgIDAKKyAgICB9OworCisgICAg c3RkOjp3c3RyaW5nIGJhc2VGb250UGF0aCA9IGZvbnRzUGF0aCgpOworICAgIGlmICghYmFzZUZv bnRQYXRoLmVtcHR5KCkpIHsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGZvbnRGaWxlbmFt ZXNbaV07ICsraSkgeworICAgICAgICAgICAgc3RkOjp3c3RyaW5nIGZvbnRQYXRoID0gYmFzZUZv bnRQYXRoICsgZm9udEZpbGVuYW1lc1tpXTsKKyAgICAgICAgICAgIEFkZEZvbnRSZXNvdXJjZUV4 Vyhmb250UGF0aC5jX3N0cigpLCBGUl9QUklWQVRFLCBudWxscHRyKTsKKyAgICAgICAgfQorICAg IH0KIH0KIAogdm9pZCBpbnN0YWxsRmFrZUhlbHZldGljYShXS1N0cmluZ1JlZikK