Skip to content

Commit 2749bae

Browse files
authored
Feedback from #19314 (#19318)
1 parent b280116 commit 2749bae

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ jobs:
577577
other.test_gen_struct_info
578578
other.test_native_call_before_init
579579
other.test_node_unhandled_rejection
580-
other.test_full_js_library
580+
other.test_full_js_library*
581581
core2.test_hello_world"
582582
# Run a few test with the most recent version of node
583583
# In particular we have some tests that require node flags on older

test/test_other.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8665,8 +8665,15 @@ def test(check, extra):
86658665
proc = test(check=True, extra=['-sIGNORE_CLOSURE_COMPILER_ERRORS'])
86668666
self.assertNotContained(WARNING, proc.stderr)
86678667

8668-
def test_full_js_library(self):
8669-
self.run_process([EMCC, test_file('hello_world.c'), '-sSTRICT_JS', '-sINCLUDE_FULL_LIBRARY', '-sASYNCIFY'])
8668+
@parameterized({
8669+
'': ([],),
8670+
'asyncify': (['-sASYNCIFY'],),
8671+
'gl_emu': (['-sLEGACY_GL_EMULATION'],),
8672+
'no_exception_throwing': (['-sDISABLE_EXCEPTION_THROWING'],),
8673+
'minimal_runtime': (['-sMINIMAL_RUNTIME'],),
8674+
})
8675+
def test_full_js_library(self, args):
8676+
self.run_process([EMCC, test_file('hello_world.c'), '-sSTRICT_JS', '-sINCLUDE_FULL_LIBRARY'] + args)
86708677

86718678
def test_full_js_library_undefined(self):
86728679
create_file('main.c', 'void foo(); int main() { foo(); return 0; }')
@@ -8678,15 +8685,6 @@ def test_full_js_library_except(self):
86788685
self.set_setting('DISABLE_EXCEPTION_CATCHING', 0)
86798686
self.do_other_test('test_full_js_library_except.cpp')
86808687

8681-
def test_full_js_library_gl_emu(self):
8682-
self.run_process([EMCC, test_file('hello_world.c'), '-sSTRICT_JS', '-sINCLUDE_FULL_LIBRARY', '-sLEGACY_GL_EMULATION'])
8683-
8684-
def test_full_js_library_no_exception_throwing(self):
8685-
self.run_process([EMCC, test_file('hello_world.c'), '-sSTRICT_JS', '-sINCLUDE_FULL_LIBRARY', '-sDISABLE_EXCEPTION_THROWING'])
8686-
8687-
def test_full_js_library_minimal_runtime(self):
8688-
self.run_process([EMCC, test_file('hello_world.c'), '-sSTRICT_JS', '-sINCLUDE_FULL_LIBRARY', '-sMINIMAL_RUNTIME'])
8689-
86908688
@crossplatform
86918689
@parameterized({
86928690
'': [[]],

0 commit comments

Comments
 (0)