Skip to content

Commit f386451

Browse files
authored
Fix JavaScriptCore argument handling in test runner (#20789)
This fixes core0.test_hello_argc. The functionality actually worked already, but the test runner did not identify jsc as jsc there so it didn't add -- for the arguments.
1 parent b7d3b30 commit f386451

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.circleci/config.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,10 @@ jobs:
688688
echo "JSC_ENGINE = [os.path.expanduser('~/.jsvu/bin/javascriptcore')]" >> ~/emsdk/.emscripten
689689
echo "JS_ENGINES = [JSC_ENGINE]" >> ~/emsdk/.emscripten
690690
- run-tests:
691-
test_targets: "core0.test_hello_world other.test_modularize_incoming other.test_modularize_incoming_export_name"
691+
test_targets: "
692+
core0.test_hello_argc
693+
other.test_modularize_incoming
694+
other.test_modularize_incoming_export_name"
692695
test-spidermonkey:
693696
executor: linux-python
694697
steps:
@@ -710,7 +713,9 @@ jobs:
710713
echo "SPIDERMONKEY_ENGINE = [os.path.expanduser('~/.jsvu/bin/spidermonkey')]" >> ~/emsdk/.emscripten
711714
echo "JS_ENGINES = [SPIDERMONKEY_ENGINE]" >> ~/emsdk/.emscripten
712715
- run-tests:
713-
test_targets: "core0.test_hello_world core2.test_demangle_stacks_symbol_map"
716+
test_targets: "
717+
core0.test_hello_argc
718+
core2.test_demangle_stacks_symbol_map"
714719
test-node-compat:
715720
# We don't use `bionic` here since its too old to run recent node versions:
716721
# `/lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.28' not found`

test/jsrun.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def make_command(filename, engine, args=None):
3636
jsengine = os.path.basename(engine[0])
3737
# Use "'d8' in" because the name can vary, e.g. d8_g, d8, etc.
3838
is_d8 = 'd8' in jsengine or 'v8' in jsengine
39-
is_jsc = 'jsc' in jsengine
39+
is_jsc = 'jsc' in jsengine or 'javascriptcore' in jsengine
4040
is_wasmer = 'wasmer' in jsengine
4141
is_wasmtime = 'wasmtime' in jsengine
4242
command_flags = []

0 commit comments

Comments
 (0)