Skip to content

Commit 9257c5b

Browse files
committed
default to safari 15, fix up some tests
1 parent 5c5da10 commit 9257c5b

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

test/test_core.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4625,7 +4625,7 @@ def test_dylink_postsets_chunking(self):
46254625

46264626
@with_dylink_reversed
46274627
@parameterized({
4628-
'libcxx': ('libc,libc++,libmalloc,libc++abi',),
4628+
'libcxx': ('libc,libc++,libmalloc,libc++abi,libbulkmemory',),
46294629
'all': ('1',),
46304630
'missing': ('libc,libmalloc,libc++abi', False, False, False),
46314631
'missing_assertions': ('libc,libmalloc,libc++abi', False, False, True),

test/test_other.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8370,7 +8370,7 @@ def test_binaryen_warn_mem(self):
83708370
self.run_process([EMCC, test_file('hello_world.c'), '-sINITIAL_MEMORY=' + str(16 * 1024 * 1024), '--pre-js', 'pre.js', '-sWASM_ASYNC_COMPILATION=0', '-sIMPORTED_MEMORY'])
83718371
out = self.run_js('a.out.js', assert_returncode=NON_ZERO)
83728372
self.assertContained('LinkError', out)
8373-
self.assertContained("memory import 2 has a larger maximum size 800 than the module's declared maximum", out)
8373+
self.assertContained("memory import 1 has a larger maximum size 800 than the module's declared maximum", out)
83748374
self.assertNotContained('hello, world!', out)
83758375
# and with memory growth, all should be good
83768376
self.run_process([EMCC, test_file('hello_world.c'), '-sINITIAL_MEMORY=' + str(16 * 1024 * 1024), '--pre-js', 'pre.js', '-sALLOW_MEMORY_GROWTH', '-sWASM_ASYNC_COMPILATION=0', '-sIMPORTED_MEMORY'])
@@ -12850,7 +12850,7 @@ def test_split_module(self, customLoader, jspi):
1285012850
self.assertExists('profile.data')
1285112851

1285212852
wasm_split = os.path.join(building.get_binaryen_bin(), 'wasm-split')
12853-
wasm_split_run = [wasm_split, '-g', '--enable-mutable-globals', '--export-prefix=%', 'test_split_module.wasm.orig', '-o1', 'primary.wasm', '-o2', 'secondary.wasm', '--profile=profile.data']
12853+
wasm_split_run = [wasm_split, '-g', '--enable-mutable-globals', '--enable-bulk-memory', '--export-prefix=%', 'test_split_module.wasm.orig', '-o1', 'primary.wasm', '-o2', 'secondary.wasm', '--profile=profile.data']
1285412854
if jspi:
1285512855
wasm_split_run += ['--jspi', '--enable-reference-types']
1285612856
self.run_process(wasm_split_run)

tools/feature_matrix.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Feature(IntEnum):
5454
Feature.BULK_MEMORY: {
5555
'chrome': 75,
5656
'firefox': 79,
57-
'safari': 150000,
57+
'safari': 140000,
5858
},
5959
Feature.MUTABLE_GLOBALS: {
6060
'chrome': 74,

tools/maybe_wasm2js.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
# main
4343

44-
cmd = [os.path.join(building.get_binaryen_bin(), 'wasm2js'), '--emscripten', wasm_file]
44+
cmd = [os.path.join(building.get_binaryen_bin(), 'wasm2js'), '--emscripten', '--enable-bulk-memory', wasm_file]
4545
cmd += opts
4646
js = shared.run_process(cmd, stdout=subprocess.PIPE).stdout
4747
# assign the instantiate function to where it will be used

0 commit comments

Comments
 (0)