Skip to content

Commit db42d3f

Browse files
authored
Use MAIN_MODULE=2 in test_dylink_global_var_export. NFC (#25630)
Using MAIN_MODULE=1 is slower and not supported by JS_MATH.
1 parent ee18e42 commit db42d3f

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

test/test_core.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ def test_stack_placement(self):
905905
@no_sanitize('sanitizers do not yet support dynamic linking')
906906
@no_wasm2js('MAIN_MODULE support')
907907
@needs_dylink
908-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
908+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
909909
def test_stack_placement_pic(self):
910910
self.set_setting('STACK_SIZE', 1024)
911911
self.set_setting('MAIN_MODULE')
@@ -1027,7 +1027,7 @@ def test_longjmp2(self):
10271027

10281028
@needs_dylink
10291029
@with_all_sjlj
1030-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
1030+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
10311031
def test_longjmp2_main_module(self):
10321032
# Test for binaryen regression:
10331033
# https://github.com/WebAssembly/binaryen/issues/2180
@@ -2991,7 +2991,7 @@ def build_dlfcn_lib(self, filename, outfile='liblib.so', cflags=None):
29912991
self.run_process(cmd)
29922992

29932993
@needs_dylink
2994-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
2994+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
29952995
def test_dlfcn_missing(self):
29962996
self.set_setting('MAIN_MODULE')
29972997
self.set_setting('ASSERTIONS')
@@ -3416,7 +3416,7 @@ def test_dlfcn_alignment_and_zeroing(self):
34163416
self.do_runf('src.c', 'success.\n')
34173417

34183418
@needs_dylink
3419-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
3419+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
34203420
def test_dlfcn_self(self):
34213421
self.set_setting('MAIN_MODULE')
34223422
self.set_setting('EXPORT_ALL')
@@ -3806,7 +3806,7 @@ def test_dlfcn_exceptions(self):
38063806
''')
38073807

38083808
@needs_dylink
3809-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
3809+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
38103810
def test_dlfcn_handle_alloc(self):
38113811
# verify that dlopen does not allocate already used handles
38123812
create_file('a.cpp', r'''
@@ -4605,7 +4605,6 @@ def test_dylink_global_var(self):
46054605
''', expected=['extern is 123.\n'], force_c=True)
46064606

46074607
@needs_dylink
4608-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
46094608
def test_dylink_global_var_export(self):
46104609
self.do_run(r'''
46114610
#include <assert.h>
@@ -4624,7 +4623,7 @@ def test_dylink_global_var_export(self):
46244623
assert(js_address == &my_number);
46254624
return 0;
46264625
}
4627-
''', cflags=['-sMAIN_MODULE'], force_c=True)
4626+
''', cflags=['-sMAIN_MODULE=2'], force_c=True)
46284627

46294628
@with_dylink_reversed
46304629
def test_dylink_global_var_modded(self):
@@ -4782,7 +4781,7 @@ def test_dylink_postsets_chunking(self):
47824781
'missing': ('libc,libmalloc,libc++abi', False, False, False),
47834782
'missing_assertions': ('libc,libmalloc,libc++abi', False, False, True),
47844783
})
4785-
@no_js_math('JS_MATH is not compatible with SIDE_MODULE')
4784+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
47864785
def test_dylink_syslibs(self, syslibs, expect_pass=True, with_reversed=True, assertions=True):
47874786
# When testing in WASMFS mode, we also need to force the WASMFS syslib into the test.
47884787
if self.get_setting('WASMFS') and syslibs != '1':
@@ -4977,7 +4976,7 @@ def test_dylink_exceptions_try_catch_2(self):
49774976

49784977
@with_all_eh_sjlj
49794978
@needs_dylink
4980-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
4979+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
49814980
def test_dylink_exceptions_try_catch_6(self):
49824981
create_file('main.cpp', r'''
49834982
#include <assert.h>
@@ -5131,7 +5130,7 @@ def test_dylink_load_compiled_side_module(self):
51315130
''', expected=['sidef: 10'])
51325131

51335132
@needs_dylink
5134-
@no_js_math('JS_MATH is not compatible with SIDE_MODULE')
5133+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
51355134
def test_dylink_dso_needed(self):
51365135
def do_run(src, expected_output, cflags=None):
51375136
create_file('main.c', src + 'int main() { return test_main(); }')
@@ -6342,7 +6341,7 @@ def test_netinet_in(self):
63426341
self.do_run_in_out_file_test('netinet/in.cpp')
63436342

63446343
@needs_dylink
6345-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
6344+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
63466345
def test_main_module_static_align(self):
63476346
if self.get_setting('ALLOW_MEMORY_GROWTH'):
63486347
self.skipTest('no shared modules with memory growth')
@@ -9470,7 +9469,7 @@ def test_pthread_dylink_longjmp(self):
94709469

94719470
@needs_dylink
94729471
@node_pthreads
9473-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
9472+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
94749473
def test_pthread_dylink_main_module_1(self):
94759474
# TODO: For some reason, -lhtml5 must be passed in -sSTRICT mode, but can NOT
94769475
# be passed when not compiling in -sSTRICT mode. That does not seem intentional?
@@ -9634,7 +9633,7 @@ def test_abort_on_exceptions_pthreads(self):
96349633
self.do_core_test('test_hello_world.c')
96359634

96369635
@needs_dylink
9637-
@no_js_math('JS_MATH is not compatible with MAIN_MODULE')
9636+
@no_js_math('JS_MATH is not compatible with MAIN_MODULE=1')
96389637
def test_gl_main_module(self):
96399638
# TODO: For some reason, -lGL must be passed in -sSTRICT mode, but can NOT
96409639
# be passed when not compiling in -sSTRICT mode. That does not seem intentional?

0 commit comments

Comments
 (0)