Skip to content

Commit f59c8af

Browse files
authored
Update some WASM_BIGINT test settings. NFC (#25011)
These are some left overs from the change in the default for this setting.
1 parent 3ff68ca commit f59c8af

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
i32: 120
22
i32: 1234
3+
i64: 0x7766554412345678 bigint
34
ptr: 0x12345678 number
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
i32: 120
22
i32: 1234
3+
i64: 0x7766554412345678 bigint
34
ptr: 0x7766554412345800 number
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
i32: 120
22
i32: 1234
3-
i64: 0x7766554412345678 bigint
43
ptr: 0x7766554412345800 number
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
i32: 120
22
i32: 1234
3-
i64: 0x7766554412345678 bigint
43
ptr: 0x12345678 number

test/test_core.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4154,7 +4154,6 @@ def test_dylink_basics_no_modify(self):
41544154
self.skipTest('ERROR_ON_WASM_CHANGES_AFTER_LINK is not applicable when using SAFE_HEAP')
41554155
if self.get_setting('MEMORY64') == 2:
41564156
self.skipTest('MEMORY64=2 always requires module re-writing')
4157-
self.set_setting('WASM_BIGINT')
41584157
self.set_setting('ERROR_ON_WASM_CHANGES_AFTER_LINK')
41594158
self.do_basic_dylink_test()
41604159

@@ -7105,16 +7104,18 @@ def test(args=None, asserts=False):
71057104
out_suffix = ''
71067105
if self.is_wasm64():
71077106
out_suffix += '64'
7108-
if self.get_setting('WASM_BIGINT'):
7109-
out_suffix += '_bigint'
7107+
if self.get_setting('WASM_BIGINT') == 0:
7108+
out_suffix += '_nobigint'
71107109
assert_returncode = 0 if not asserts else NON_ZERO
71117110
self.do_core_test('test_getValue_setValue.cpp',
71127111
out_suffix=out_suffix,
71137112
assert_returncode=assert_returncode,
71147113
cflags=args)
71157114

7116-
if self.get_setting('WASM_BIGINT'):
7115+
if self.get_setting('WASM_BIGINT') != 0:
71177116
self.cflags += ['-DWASM_BIGINT']
7117+
if self.is_wasm2js():
7118+
self.skipTest('WASM_BIGINT is not compatible with WASM2JS')
71187119

71197120
# see that direct usage (not on module) works. we don't export, but the use
71207121
# keeps it alive through JSDCE

test/test_other.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8731,11 +8731,10 @@ def test_EM_ASM_i64(self):
87318731
self.do_other_test('test_em_asm_i64.cpp')
87328732
self.do_other_test('test_em_asm_i64.cpp', force_c=True)
87338733

8734+
def test_EM_ASM_i64_nobigint(self):
87348735
self.set_setting('WASM_BIGINT', 0)
87358736
expected = 'Invalid character 106("j") in readEmAsmArgs!'
8736-
self.do_runf('other/test_em_asm_i64.cpp',
8737-
expected_output=expected,
8738-
assert_returncode=NON_ZERO)
8737+
self.do_runf('other/test_em_asm_i64.cpp', expected_output=expected, assert_returncode=NON_ZERO)
87398738

87408739
def test_eval_ctor_ordering(self):
87418740
# ensure order of execution remains correct, even with a bad ctor
@@ -13446,7 +13445,6 @@ def test_standalone_export_main(self):
1344613445
@requires_wasm_eh
1344713446
def test_standalone_wasm_exceptions(self):
1344813447
self.set_setting('STANDALONE_WASM')
13449-
self.set_setting('WASM_BIGINT')
1345013448
self.wasm_engines = []
1345113449
self.cflags += ['-fwasm-exceptions']
1345213450
self.set_setting('WASM_LEGACY_EXCEPTIONS', 0)
@@ -15605,8 +15603,6 @@ def test_add_js_function(self, wasm2js):
1560515603
})
1560615604
@requires_v8
1560715605
def test_add_js_function_bigint(self, memory64, wasm_function):
15608-
self.set_setting('WASM_BIGINT')
15609-
1561015606
if memory64:
1561115607
self.require_wasm64()
1561215608

0 commit comments

Comments
 (0)