Skip to content

Covert a couple of EH tests to @parameterize. NFC #27576

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
Aug 20, 2026
+12 −12
Merged

Covert a couple of EH tests to @parameterize. NFC #27576

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions test/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8806,13 +8806,13 @@ def test_lto_flags(self):
# We have LTO tests covered in 'wasmltoN' targets in test_core.py, but they
# don't run as a part of Emscripten CI, so we add a separate LTO test here.
@requires_wasm_eh
def test_lto_wasm_exceptions(self):
@parameterized({
'': (['-sWASM_LEGACY_EXCEPTIONS=0'],),

@aheejin aheejin Aug 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
'': (['-sWASM_LEGACY_EXCEPTIONS=0'],),
'': ([],),

We may not need this if #27575 lands? The same for below

@aheejin aheejin Aug 20, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case this is planned to land before #27575, looks good

@sbc100 sbc100 Aug 20, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the idea is to land this first.

'legacy': (['-sWASM_LEGACY_EXCEPTIONS'],),
})
def test_lto_wasm_exceptions(self, args):
self.set_setting('EXCEPTION_DEBUG')
self.cflags += ['-fwasm-exceptions', '-flto']
self.set_setting('WASM_LEGACY_EXCEPTIONS', 0)
self.do_runf_out_file('core/test_exceptions.cpp', out_suffix='_caught')
self.set_setting('WASM_LEGACY_EXCEPTIONS')
self.do_runf_out_file('core/test_exceptions.cpp', out_suffix='_caught')
self.do_runf_out_file('core/test_exceptions.cpp', out_suffix='_caught', cflags=['-fwasm-exceptions', '-flto'] + args)

@parameterized({
'': ([],),
Expand Down Expand Up @@ -12514,14 +12514,14 @@ def test_standalone_export_main(self):
self.run_process([EMCC, '-sEXPORTED_FUNCTIONS=_main', '-sSTANDALONE_WASM', test_file('core/test_hello_world.c')])

@requires_wasm_eh
def test_standalone_wasm_exceptions(self):
@parameterized({
'': (['-sWASM_LEGACY_EXCEPTIONS=0'],),
'legacy': (['-sWASM_LEGACY_EXCEPTIONS'],),
})
def test_standalone_wasm_exceptions(self, args):
self.set_setting('STANDALONE_WASM')
self.wasm_engines = []
self.cflags += ['-fwasm-exceptions']
self.set_setting('WASM_LEGACY_EXCEPTIONS', 0)
self.do_runf_out_file('core/test_exceptions.cpp', out_suffix='_caught')
self.set_setting('WASM_LEGACY_EXCEPTIONS')
self.do_runf_out_file('core/test_exceptions.cpp', out_suffix='_caught')
self.do_runf_out_file('core/test_exceptions.cpp', out_suffix='_caught', cflags=['-fwasm-exceptions'] + args)

def test_missing_malloc_export(self):
# we used to include malloc by default. show a clear error in builds with
Expand Down
Loading