Skip to content

Commit f4fb3cd

Browse files
authored
Cleanup wget browser tests. NFC (#23907)
Rename `emscripten_fs_api_browser.c` to `test_emscripten_async_wget.c` since that seems to be the primary thing its testing. Remove `emscripten_fs_api_browser2.c` since that just seems like a strict subset of what is tested already in `emscripten_fs_api_browser.c` Rename `test_emscripten_async_wget_side_module` source files. Group all wget tests together in `test_browser.py`.
1 parent 4274adf commit f4fb3cd

5 files changed

+20
-75
lines changed

test/emscripten_fs_api_browser2.c

Lines changed: 0 additions & 55 deletions
This file was deleted.

test/test_browser.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1892,15 +1892,6 @@ def setup():
18921892
def test_emscripten_api_infloop(self):
18931893
self.btest_exit('emscripten_api_browser_infloop.cpp')
18941894

1895-
@also_with_wasmfs
1896-
def test_emscripten_fs_api(self):
1897-
shutil.copy(test_file('screenshot.png'), '.') # preloaded *after* run
1898-
self.btest_exit('emscripten_fs_api_browser.c', emcc_args=['-lSDL'])
1899-
1900-
def test_emscripten_fs_api2(self):
1901-
self.btest_exit('emscripten_fs_api_browser2.c', emcc_args=['-sASSERTIONS=0'])
1902-
self.btest_exit('emscripten_fs_api_browser2.c', emcc_args=['-sASSERTIONS=1'])
1903-
19041895
@parameterized({
19051896
'': ([],),
19061897
'pthreads': (['-pthread', '-sPROXY_TO_PTHREAD', '-sEXIT_RUNTIME'],),
@@ -2516,6 +2507,24 @@ def test_worker_api_with_pthread_compilation_fails(self):
25162507
stderr = self.expect_fail([EMCC, 'hello.o', '-o', 'a.js', '-g', '--closure=1', '-pthread', '-sBUILD_AS_WORKER'])
25172508
self.assertContained("pthreads + BUILD_AS_WORKER require separate modes that don't work together, see https://github.com/emscripten-core/emscripten/issues/8854", stderr)
25182509

2510+
@also_with_wasmfs
2511+
def test_wget(self):
2512+
create_file('test.txt', 'emscripten')
2513+
self.btest_exit('test_wget.c', emcc_args=['-sASYNCIFY'])
2514+
2515+
def test_wget_data(self):
2516+
create_file('test.txt', 'emscripten')
2517+
self.btest_exit('test_wget_data.c', emcc_args=['-O2', '-g2', '-sASYNCIFY'])
2518+
2519+
@also_with_wasmfs
2520+
@parameterized({
2521+
'': ([],),
2522+
'O2': (['-O2'],),
2523+
})
2524+
def test_emscripten_async_wget(self, args):
2525+
shutil.copy(test_file('screenshot.png'), '.') # preloaded *after* run
2526+
self.btest_exit('test_emscripten_async_wget.c', emcc_args=['-lSDL'] + args)
2527+
25192528
@also_with_wasmfs
25202529
def test_emscripten_async_wget2(self):
25212530
self.btest_exit('test_emscripten_async_wget2.cpp')
@@ -2526,8 +2535,8 @@ def test_emscripten_async_wget2_data(self):
25262535
self.btest('test_emscripten_async_wget2_data.cpp', expected='0')
25272536

25282537
def test_emscripten_async_wget_side_module(self):
2529-
self.emcc(test_file('browser_module.c'), ['-o', 'lib.wasm', '-O2', '-sSIDE_MODULE'])
2530-
self.btest_exit('browser_main.c', emcc_args=['-O2', '-sMAIN_MODULE=2'])
2538+
self.emcc(test_file('test_emscripten_async_wget_side_module.c'), ['-o', 'lib.wasm', '-O2', '-sSIDE_MODULE'])
2539+
self.btest_exit('test_emscripten_async_wget_main_module.c', emcc_args=['-O2', '-sMAIN_MODULE=2'])
25312540

25322541
@parameterized({
25332542
'': ([],),
@@ -2845,15 +2854,6 @@ def test_html5_mouse(self, opts):
28452854
def test_sdl_mousewheel(self, opts):
28462855
self.btest_exit('test_sdl_mousewheel.c', emcc_args=opts + ['-DAUTOMATE_SUCCESS=1', '-lSDL', '-lGL'])
28472856

2848-
@also_with_wasmfs
2849-
def test_wget(self):
2850-
create_file('test.txt', 'emscripten')
2851-
self.btest_exit('test_wget.c', emcc_args=['-sASYNCIFY'])
2852-
2853-
def test_wget_data(self):
2854-
create_file('test.txt', 'emscripten')
2855-
self.btest_exit('test_wget_data.c', emcc_args=['-O2', '-g2', '-sASYNCIFY'])
2856-
28572857
@also_with_wasm2js
28582858
@parameterized({
28592859
'': ([],),
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)