Skip to content

Commit fc97ec9

Browse files
authored
Update test skips and comments related to OffscreenCanvas tests in Firefox (#25496)
Update test skips and comments related to OffscreenCanvas tests in Firefox.
1 parent d9e0690 commit fc97ec9

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.circleci/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,16 +1113,10 @@ jobs:
11131113
# initial position of the mouse pointer relative to the canvas.
11141114
# browser.test_html5_webgl_create_context is skipped because
11151115
# anti-aliasing is not well supported.
1116-
# browser.test_webgl_offscreen_canvas_in_pthread and
1117-
# browser.test_webgl_offscreen_canvas_in_mainthread_after_pthread
1118-
# are crashing Firefox (bugzil.la/1281796). The former case is
1119-
# further blocked by issue #6897.
11201116
test_targets: "
11211117
browser
11221118
skip:browser.test_sdl2_mouse
11231119
skip:browser.test_html5_webgl_create_context
1124-
skip:browser.test_webgl_offscreen_canvas_in_pthread
1125-
skip:browser.test_webgl_offscreen_canvas_in_mainthread_after_pthread
11261120
skip:browser.test_glut_glutget
11271121
"
11281122
test-browser-firefox-wasm64:

test/test_browser.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4241,6 +4241,9 @@ def test_utf16_textdecoder(self):
42414241
# Tests that it is possible to initialize and render WebGL content in a
42424242
# pthread by using OffscreenCanvas.
42434243
@no_chrome('https://crbug.com/961765')
4244+
# The non-chained version suffers from browser priority inversion deadlock problem: offscreenCanvas.getContext("webgl2") does not make progress in a pthread until main thread yields to event loop.
4245+
# The chained version of this test suffers from bug https://bugzilla.mozilla.org/show_bug.cgi?id=1992576
4246+
@no_firefox('https://bugzilla.mozilla.org/show_bug.cgi?id=1972240 (priority inversion deadlock) + https://bugzilla.mozilla.org/show_bug.cgi?id=1992576 (chained OffscreenCanvas transfer)')
42444247
@parameterized({
42454248
'': ([],),
42464249
# -DTEST_CHAINED_WEBGL_CONTEXT_PASSING:
@@ -4430,6 +4433,12 @@ def test_webgl_offscreen_canvas_in_proxied_pthread(self, asyncify):
44304433
@requires_offscreen_canvas
44314434
def test_webgl_resize_offscreencanvas_from_main_thread(self, args1, args2, args3):
44324435
cmd = args1 + args2 + args3 + ['-pthread', '-lGL', '-sGL_DEBUG']
4436+
4437+
if is_firefox() and '-sOFFSCREENCANVAS_SUPPORT' in cmd and '-sPROXY_TO_PTHREAD' in cmd:
4438+
# Firefox is unable to transfer the same OffscreenCanvas multiple times across Workers
4439+
# (in a chained fashion, e.g. main thread -> proxy-to-pthread main thread -> back to main thread -> user pthread)
4440+
self.skipTest('https://bugzilla.mozilla.org/show_bug.cgi?id=1992576')
4441+
44334442
print(str(cmd))
44344443
self.btest_exit('test_webgl_resize_offscreencanvas_from_main_thread.c', cflags=cmd)
44354444

0 commit comments

Comments
 (0)