Skip to content

Commit 0b0a3ea

Browse files
committed
enable browser.test_sdl_ttf_render_text_solid on CircleCI
ttf-mscorefonts-installer allows for easy installation of the Microsoft True Type Core Fonts for the Web including Arial. The package requires acceptance of an EULA*. Informally speaking: These fonts were provided by Microsoft "in the interest of cross-platform compatibility". This is no longer the case, but they are still available from third parties. You are free to download these fonts and use them for your own use, but you may not redistribute them in modified form, including changes to the file name or packaging format. * http://corefonts.sourceforge.net/eula.htm
1 parent cc4e567 commit 0b0a3ea

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.circleci/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ test-defaults: &test-defaults
2020
apt-get update
2121
# preseed packages so that apt-get won't prompt for user input
2222
echo "keyboard-configuration keyboard-configuration/layoutcode string us" | debconf-set-selections
23+
echo "ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true" | debconf-set-selections
2324
apt-get install -y python3 cmake build-essential openjdk-9-jre-headless $TEST_DEPENDENCY
2425
if [ x"$DISPLAY" != x ]; then
2526
# Start an X session. Openbox might be optional for now, but
@@ -140,7 +141,6 @@ jobs:
140141
test-browser:
141142
<<: *test-defaults
142143
environment:
143-
# browser.test_sdl_ttf_render_text_solid depends on Arial from Microsoft
144144
# browser.test_sdl2_mouse and/or SDL2 should be fixed. The case happens
145145
# to be failing here, and the root cause might be related with the
146146
# initial position of the mouse pointer relative to the canvas.
@@ -153,9 +153,9 @@ jobs:
153153
# alive for async functions, but the change got reverted by #5878;
154154
# 2) the current thread should not transfer offscreen canvases
155155
# back to a dead parent thread.
156-
- TEST_TARGET=browser skip:browser.test_sdl_ttf_render_text_solid skip:browser.test_sdl2_mouse skip:browser.test_html5_webgl_create_context skip:browser.test_webgl_offscreen_canvas_in_pthread skip:browser.test_webgl_offscreen_canvas_in_mainthread_after_pthread
156+
- TEST_TARGET=browser skip:browser.test_sdl2_mouse skip:browser.test_html5_webgl_create_context skip:browser.test_webgl_offscreen_canvas_in_pthread skip:browser.test_webgl_offscreen_canvas_in_mainthread_after_pthread
157157
# TODO: use Firefox headless mode when https://bugzil.la/1375585 resolves
158-
- TEST_DEPENDENCY=dbus-x11 firefox menu openbox xinit xserver-xorg xserver-xorg-video-dummy
158+
- TEST_DEPENDENCY=dbus-x11 firefox menu openbox ttf-mscorefonts-installer xinit xserver-xorg xserver-xorg-video-dummy
159159
- EMSCRIPTEN_BROWSER=firefox -profile tmp-firefox-profile/
160160
- EM_LACKS_SOUND_HARDWARE=1
161161
- EM_TESTRUNNER_DETECT_TEMPFILE_LEAKS=0

0 commit comments

Comments
 (0)