Skip to content

Commit a97708d

Browse files
committed
Remove @no_wasm_backend test decorator. NFC
Fixes: #12335
1 parent 7d9aceb commit a97708d

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

src/settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1443,7 +1443,7 @@ var USE_HARFBUZZ = false;
14431443

14441444
// 3 = use cocos2d v3 from emscripten-ports
14451445
// [link]
1446-
var USE_COCOS2D = false;
1446+
var USE_COCOS2D = 0;
14471447

14481448
// 1 = use libmodplug from emscripten-ports
14491449
// [link]

tests/test_browser.py

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,6 @@ def decorated(self, *args, **kwargs):
161161
return decorated
162162

163163

164-
# Today we only support the wasm backend so any tests that is disabled under the llvm
165-
# backend is always disabled.
166-
# TODO(sbc): Investigate all tests with this decorator and either fix of remove the test.
167-
def no_wasm_backend(note=''):
168-
assert not callable(note)
169-
return unittest.skip(note)
170-
171-
172164
requires_graphics_hardware = unittest.skipIf(os.getenv('EMTEST_LACKS_GRAPHICS_HARDWARE'), "This test requires graphics hardware")
173165
requires_sound_hardware = unittest.skipIf(os.getenv('EMTEST_LACKS_SOUND_HARDWARE'), "This test requires sound hardware")
174166
requires_sync_compilation = unittest.skipIf(is_chrome(), "This test requires synchronous compilation, which does not work in Chrome (except for tiny wasms)")
@@ -3291,7 +3283,6 @@ def test_sdl2_mixer_music(self, formats, flags, music_name):
32913283
'-sINITIAL_MEMORY=33554432'
32923284
])
32933285

3294-
@no_wasm_backend('cocos2d needs to be ported')
32953286
@requires_graphics_hardware
32963287
def test_cocos2d_hello(self):
32973288
cocos2d_root = os.path.join(ports.Ports.get_build_dir(), 'cocos2d')
@@ -4646,19 +4637,19 @@ def test_fetch_sync_xhr_in_proxy_to_worker(self):
46464637
args=['-sFETCH_DEBUG', '-sFETCH', '--proxy-to-worker'])
46474638

46484639
# Tests waiting on EMSCRIPTEN_FETCH_WAITABLE request from a worker thread
4649-
@no_wasm_backend("emscripten_fetch_wait uses an asm.js based web worker")
4640+
@unittest.skip("emscripten_fetch_wait relised on an asm.js-based web worker")
46504641
@requires_threads
46514642
def test_fetch_sync_fetch_in_main_thread(self):
46524643
shutil.copyfile(test_file('gears.png'), 'gears.png')
46534644
self.btest_exit('fetch/sync_fetch_in_main_thread.cpp', args=['-sFETCH_DEBUG', '-sFETCH', '-sWASM=0', '-sUSE_PTHREADS', '-sPROXY_TO_PTHREAD'])
46544645

46554646
@requires_threads
4656-
@no_wasm_backend("WASM2JS does not yet support pthreads")
4647+
@disabled('https://github.com/emscripten-core/emscripten/issues/16746')
46574648
def test_fetch_idb_store(self):
46584649
self.btest_exit('fetch/idb_store.cpp', args=['-sUSE_PTHREADS', '-sFETCH', '-sWASM=0', '-sPROXY_TO_PTHREAD'])
46594650

46604651
@requires_threads
4661-
@no_wasm_backend("WASM2JS does not yet support pthreads")
4652+
@disabled('https://github.com/emscripten-core/emscripten/issues/16746')
46624653
def test_fetch_idb_delete(self):
46634654
shutil.copyfile(test_file('gears.png'), 'gears.png')
46644655
self.btest_exit('fetch/idb_delete.cpp', args=['-sUSE_PTHREADS', '-sFETCH_DEBUG', '-sFETCH', '-sWASM=0', '-sPROXY_TO_PTHREAD'])

0 commit comments

Comments
 (0)