Skip to content

Commit 347da58

Browse files
authored
Enable wasm64 testing under spidermonkey. NFC (#26719)
1 parent 9c7820a commit 347da58

File tree

5 files changed

+20
-11
lines changed

5 files changed

+20
-11
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,6 +942,7 @@ jobs:
942942
echo "JS_ENGINES = [SPIDERMONKEY_ENGINE]" >> ~/emsdk/.emscripten
943943
- run-tests:
944944
test_targets: "
945+
other.test_stdint_limits_wasm64
945946
core0.test_hello_argc
946947
core2.test_demangle_stacks_symbol_map"
947948
- upload-test-results
@@ -1416,7 +1417,7 @@ workflows:
14161417
#- test-bun
14171418
#- test-deno
14181419
#- test-jsc
1419-
#- test-spidermonkey
1420+
- test-spidermonkey
14201421
#- test-node-compat
14211422
#- test-windows
14221423
#- test-windows-browser-firefox

test/common.py

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,11 @@ def engine_is_v8(engine):
285285
return match_engine_executable(engine, 'd8') or match_engine_executable(engine, 'v8')
286286

287287

288+
def engine_is_spidermonkey(engine):
289+
assert type(engine) is list
290+
return match_engine_executable(engine, 'spidermonkey')
291+
292+
288293
def engine_is_deno(engine):
289294
assert type(engine) is list
290295
return match_engine_executable(engine, 'deno')
@@ -311,6 +316,10 @@ def get_v8():
311316
return get_engine(engine_is_v8)
312317

313318

319+
def get_spidermonkey():
320+
return get_engine(engine_is_spidermonkey)
321+
322+
314323
def get_bun():
315324
return get_engine(engine_is_bun)
316325

@@ -499,6 +508,12 @@ def require_wasm64(self):
499508
if self.try_require_node_version(24):
500509
return
501510

511+
spidermonkey = get_spidermonkey()
512+
if spidermonkey:
513+
self.cflags.append('-sENVIRONMENT=shell')
514+
self.require_engine(spidermonkey)
515+
return
516+
502517
v8 = get_v8()
503518
if v8:
504519
self.cflags.append('-sENVIRONMENT=shell')
@@ -510,7 +525,7 @@ def require_wasm64(self):
510525
def try_require_node_version(self, major, minor=0, revision=0):
511526
nodejs = get_nodejs()
512527
if not nodejs:
513-
self.skipTest('Test requires nodejs to run')
528+
return False
514529
version = shared.get_node_version(nodejs)
515530
if version < (major, minor, revision):
516531
return False

test/embind/imvu_test_adapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ function run_all_tests() {
610610
console.log(`${msg.name}: ${msg.verdict}`);
611611
}
612612
}
613-
const filter = process.env['EMBIND_TESTS'];
613+
const filter = globalThis.process?.env['EMBIND_TESTS'];
614614
run_tests(report_to_stdout, filter);
615615
}
616616

test/embind/underscore-1.4.2.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -933,14 +933,6 @@
933933
};
934934
});
935935

936-
// Define a fallback version of the method in browsers (ahem, IE), where
937-
// there isn't any inspectable "Arguments" type.
938-
if (!_.isArguments(arguments)) {
939-
_.isArguments = function(obj) {
940-
return !!(obj && _.has(obj, 'callee'));
941-
};
942-
}
943-
944936
// Optimize `isFunction` if appropriate.
945937
if (typeof (/./) !== 'function') {
946938
_.isFunction = function(obj) {

test/test_other.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13502,6 +13502,7 @@ def test_tutorial(self):
1350213502
# Ensure that files referenced in Tutorial.rst are buildable
1350313503
self.run_process([EMCC, test_file('hello_world_file.cpp')])
1350413504

13505+
@crossplatform
1350513506
@also_with_wasm64
1350613507
def test_stdint_limits(self):
1350713508
if self.is_wasm64():

0 commit comments

Comments
 (0)