Skip to content

Commit a15aa2c

Browse files
committed
[Wasm64] Fix autoconf tests, and enable test_bullet
1 parent 974c73e commit a15aa2c

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

emcc.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -630,10 +630,15 @@ def check_human_readable_list(items):
630630
def make_js_executable(script):
631631
src = read_file(script)
632632
cmd = config.JS_ENGINE
633-
if settings.WASM_BIGINT:
633+
if settings.MEMORY64 == 1:
634+
if not config.V8_ENGINE:
635+
exit_with_error('V8_ENGINE is required in order to run configure tests with MEMORY64 enabled')
636+
cmd = config.V8_ENGINE
637+
cmd.append('--experimental-wasm-memory64')
638+
elif settings.WASM_BIGINT:
634639
cmd.append('--experimental-wasm-bigint')
635640
cmd = shared.shlex_join(cmd)
636-
if not os.path.isabs(config.JS_ENGINE[0]):
641+
if not os.path.isabs(cmd[0]) or len(cmd) > 1:
637642
# TODO: use whereis etc. And how about non-*NIX?
638643
cmd = '/usr/bin/env -S ' + cmd
639644
logger.debug('adding `#!` to JavaScript file: %s' % cmd)
@@ -1596,7 +1601,10 @@ def phase_linker_setup(options, state, newargs, user_settings):
15961601
# configure tests want a more shell-like style, where we emit return codes on exit()
15971602
settings.EXIT_RUNTIME = 1
15981603
# use node.js raw filesystem access, to behave just like a native executable
1599-
settings.NODERAWFS = 1
1604+
if settings.MEMORY64 == 1:
1605+
settings.ENVIRONMENT = 'shell'
1606+
else:
1607+
settings.NODERAWFS = 1
16001608
# Add `#!` line to output JS and make it executable.
16011609
options.executable = True
16021610

test/test_core.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6805,7 +6805,6 @@ def test_zlib(self, use_cmake):
68056805

68066806
@needs_make('make')
68076807
@is_slow_test
6808-
@no_wasm64('TODO produces different output')
68096808
@no_ubsan('it seems that bullet contains UB')
68106809
@parameterized({
68116810
'cmake': (True,),
@@ -6817,12 +6816,13 @@ def test_bullet(self, use_cmake):
68176816
self.skipTest("Windows cannot run configure sh scripts")
68186817

68196818
self.emcc_args += [
6820-
'-Wno-c++11-narrowing',
6821-
'-Wno-deprecated-register',
6822-
'-Wno-writable-strings',
6823-
'-Wno-shift-negative-value',
6824-
'-Wno-format',
6825-
'-Wno-bitfield-constant-conversion',
6819+
'-Wno-c++11-narrowing',
6820+
'-Wno-deprecated-register',
6821+
'-Wno-writable-strings',
6822+
'-Wno-shift-negative-value',
6823+
'-Wno-format',
6824+
'-Wno-bitfield-constant-conversion',
6825+
'-Wno-int-to-void-pointer-cast',
68266826
]
68276827

68286828
# extra testing for ASSERTIONS == 2

0 commit comments

Comments
 (0)