Skip to content

Commit e236fa3

Browse files
authored
Update usage of WASM_BIGINT in test_other.py (#24683)
Since WASM_BIGINT is enabled by default some of these usages needed updating.
1 parent 4faf26f commit e236fa3

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

test/test_other.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2207,16 +2207,14 @@ def test_dylink_pthread_warning(self):
22072207
self.assertContained('error: -sMAIN_MODULE + pthreads is experimental', err)
22082208

22092209
@node_pthreads
2210-
def test_dylink_pthread_bigint_em_asm(self):
2210+
def test_dylink_pthread_em_asm(self):
22112211
self.set_setting('MAIN_MODULE', 2)
2212-
self.set_setting('WASM_BIGINT')
22132212
self.cflags += ['-Wno-experimental', '-pthread']
22142213
self.do_runf('hello_world_em_asm.c', 'hello, world')
22152214

22162215
@node_pthreads
2217-
def test_dylink_pthread_bigint_em_js(self):
2216+
def test_dylink_pthread_em_js(self):
22182217
self.set_setting('MAIN_MODULE', 2)
2219-
self.set_setting('WASM_BIGINT')
22202218
self.set_setting('EXPORTED_FUNCTIONS', '_malloc,_main')
22212219
self.cflags += ['-Wno-experimental', '-pthread']
22222220
self.do_runf('core/test_em_js.cpp')
@@ -3158,7 +3156,7 @@ def test_dwarf_sourcemap_names(self):
31583156
(['-g', '-gsource-map'], True, True, True),
31593157
(['-g2', '-gsource-map'], False, True, True),
31603158
(['-gsplit-dwarf', '-gsource-map'], True, True, True),
3161-
(['-gsource-map', '-sWASM_BIGINT', '-sERROR_ON_WASM_CHANGES_AFTER_LINK'], False, True, True),
3159+
(['-gsource-map', '-sERROR_ON_WASM_CHANGES_AFTER_LINK'], False, True, True),
31623160
]:
31633161
print(flags, expect_dwarf, expect_sourcemap, expect_names)
31643162
self.emcc(test_file(source_file), flags, js_file)
@@ -5731,7 +5729,7 @@ def guess_symbols_file_type(symbols_file):
57315729
'': [[]],
57325730
# bigint support is interesting to test here because it changes which
57335731
# binaryen tools get run, which can affect how debug info is kept around
5734-
'bigint': [['-sWASM_BIGINT']],
5732+
'nobigint': [['-sWASM_BIGINT=0']],
57355733
})
57365734
def test_symbol_map_output_size(self, args):
57375735
# build with and without a symbol map and verify that the sizes are the
@@ -6524,8 +6522,6 @@ def test_only_force_stdlibs_2(self):
65246522
@with_env_modify({'EMCC_FORCE_STDLIBS': '1'})
65256523
def test_force_stdlibs(self):
65266524
self.do_runf('hello_world.c')
6527-
# See https://github.com/emscripten-core/emscripten/issues/22161
6528-
self.do_runf('hello_world.c', cflags=['-sWASM_BIGINT'])
65296525

65306526
@also_with_standalone_wasm()
65316527
def test_time(self):
@@ -10280,7 +10276,7 @@ def test_full_js_library_except(self):
1028010276
'': [[]],
1028110277
# bigint support is interesting to test here because it changes which
1028210278
# binaryen tools get run, which can affect how debug info is kept around
10283-
'bigint': [['-sWASM_BIGINT']],
10279+
'nobigint': [['-sWASM_BIGINT=0']],
1028410280
'pthread': [['-pthread', '-Wno-experimental']],
1028510281
'pthread_offscreen': [['-pthread', '-Wno-experimental', '-sOFFSCREEN_FRAMEBUFFER']],
1028610282
'wasmfs': [['-sWASMFS']],
@@ -11082,9 +11078,9 @@ def test_wasm_producers_section(self, args):
1108211078

1108311079
@parameterized({
1108411080
'': ([],),
11085-
# in some modes we skip wasm-emscripten-finalize, which normally strips the
11081+
# in some modes we run wasm-emscripten-finalize, which normally strips the
1108611082
# features section for us, so add testing for those
11087-
'bigint': (['-sWASM_BIGINT'],),
11083+
'nobigint': (['-sWASM_BIGINT=0'],),
1108811084
'wasm64': (['-sMEMORY64'],),
1108911085
})
1109011086
def test_wasm_features_section(self, args):
@@ -12542,7 +12538,7 @@ def test_fignore_exceptions(self):
1254212538
'compile_only': (['-fexceptions'], [], False),
1254312539
# just link isn't enough as codegen didn't emit exceptions support
1254412540
'link_only': ([], ['-fexceptions'], False),
12545-
'standalone': (['-fexceptions'], ['-fexceptions', '-sSTANDALONE_WASM', '-sWASM_BIGINT'], True),
12541+
'standalone': (['-fexceptions'], ['-fexceptions', '-sSTANDALONE_WASM'], True),
1254612542
})
1254712543
def test_f_exception(self, compile_flags, link_flags, expect_caught):
1254812544
create_file('src.cpp', r'''
@@ -13529,9 +13525,10 @@ def test_this_in_dyncall_memory64(self):
1352913525

1353013526
# Tests that dynCalls are produced in Closure-safe way in DYNCALLS mode when no actual dynCalls are used
1353113527
@parameterized({
13532-
'plain': [[]],
13528+
'': [[]],
1353313529
'asyncify': [['-sASYNCIFY']],
13534-
'asyncify_bigint': [['-sASYNCIFY', '-sWASM_BIGINT']]})
13530+
'asyncify_nobigint': [['-sASYNCIFY', '-sWASM_BIGINT=0']],
13531+
})
1353513532
def test_closure_safe(self, args):
1353613533
self.run_process([EMCC, test_file('hello_world.c'), '--closure=1'] + args)
1353713534

0 commit comments

Comments
 (0)