Skip to content

Commit 947c06d

Browse files
msimacekmsimacek
committed
[GR-21590] Update imports
PullRequest: graalpython/4039
2 parents 7df0ccf + cb54db2 commit 947c06d

File tree

8 files changed

+21
-33
lines changed

8 files changed

+21
-33
lines changed

‎ci/graal/ci/common.jsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ local common_json = import "../common.json";
316316

317317
wasm:: {
318318
downloads+: {
319-
WABT_DIR: {name: 'wabt', version: '1.0.36', platformspecific: true},
319+
WABT_DIR: {name: 'wabt', version: '1.0.37', platformspecific: true},
320320
},
321321
environment+: {
322322
WABT_DIR: '$WABT_DIR/bin',
@@ -325,7 +325,7 @@ local common_json = import "../common.json";
325325

326326
wasm_ol8:: {
327327
downloads+: {
328-
WABT_DIR: {name: 'wabt', version: '1.0.36-ol8', platformspecific: true},
328+
WABT_DIR: {name: 'wabt', version: '1.0.37-ol8', platformspecific: true},
329329
},
330330
environment+: {
331331
WABT_DIR: '$WABT_DIR/bin',

‎ci/graal/common.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },
5656

5757
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+37", "platformspecific": true, "extrabundles": ["static-libs"]},
58-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+37-jvmci-b02", "platformspecific": true },
59-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+37-jvmci-b02-debug", "platformspecific": true },
60-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+37-jvmci-b02-sulong", "platformspecific": true },
61-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+37-jvmci-b02", "platformspecific": true },
62-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+37-jvmci-b02-debug", "platformspecific": true },
63-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+37-jvmci-b02-sulong", "platformspecific": true }
58+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+37-jvmci-b06", "platformspecific": true },
59+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+37-jvmci-b06-debug", "platformspecific": true },
60+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+37-jvmci-b06-sulong", "platformspecific": true },
61+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+37-jvmci-b06", "platformspecific": true },
62+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+37-jvmci-b06-debug", "platformspecific": true },
63+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+37-jvmci-b06-sulong", "platformspecific": true }
6464
},
6565

6666
"eclipse": {

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_capi.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ test.test_capi.test_misc.Test_testcapi.test_empty_argparse @ darwin-arm64,darwin
230230
test.test_capi.test_misc.Test_testcapi.test_from_contiguous @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
231231
test.test_capi.test_misc.Test_testcapi.test_from_spec_metatype_inheritance @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
232232
test.test_capi.test_misc.Test_testcapi.test_gc_control @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
233+
test.test_capi.test_misc.Test_testcapi.test_gc_visit_objects_basic @ darwin-arm64,linux-aarch64,linux-x86_64,win32-AMD64
233234
test.test_capi.test_misc.Test_testcapi.test_gc_visit_objects_exit_early @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
234235
test.test_capi.test_misc.Test_testcapi.test_get_statictype_slots @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
235236
test.test_capi.test_misc.Test_testcapi.test_get_type_dict @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_mmap.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ test.test_mmap.MmapTests.test_find_end @ darwin-arm64,darwin-x86_64,linux-aarch6
1414
test.test_mmap.MmapTests.test_flush_return_value @ darwin-arm64,darwin-x86_64,win32-AMD64
1515
test.test_mmap.MmapTests.test_length_0_large_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
1616
test.test_mmap.MmapTests.test_length_0_offset @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
17-
test.test_mmap.MmapTests.test_offset @ darwin-x86_64,linux-aarch64,linux-x86_64
18-
test.test_mmap.MmapTests.test_prot_readonly @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
17+
test.test_mmap.MmapTests.test_offset @ darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
18+
test.test_mmap.MmapTests.test_prot_readonly @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
1919
test.test_mmap.MmapTests.test_read_all @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2020
test.test_mmap.MmapTests.test_read_invalid_arg @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
2121
test.test_mmap.MmapTests.test_subclass @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_zipfile.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test.test_zipfile._path.test_path.TestPath.test_open_missing_directory @ darwin-
3636
test.test_zipfile._path.test_path.TestPath.test_open_write @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3737
test.test_zipfile._path.test_path.TestPath.test_parent @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
3838
test.test_zipfile._path.test_path.TestPath.test_pathlike_construction @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
39-
test.test_zipfile._path.test_path.TestPath.test_pickle @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64
39+
test.test_zipfile._path.test_path.TestPath.test_pickle @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
4040
test.test_zipfile._path.test_path.TestPath.test_read @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
4141
test.test_zipfile._path.test_path.TestPath.test_read_does_not_close @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64
4242
test.test_zipfile._path.test_path.TestPath.test_relative_to @ darwin-arm64,darwin-x86_64,linux-aarch64,linux-x86_64,win32-AMD64

‎mx.graalpython/downstream_tests.py‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,6 @@ def downstream_test_hpy(graalpy, testdir=None, args=None, env=None, check=True,
7676
hpy_test_root = hpy_root / "test"
7777
venv = testdir / 'hpy_venv'
7878
run([graalpy, "-m", "venv", str(venv)])
79-
if graalpy.endswith('.sh'):
80-
# Workaround jacoco launcher creating broken venv
81-
venv_launcher_path = venv / "bin" / "graalpy.sh"
82-
launcher = venv_launcher_path.read_text()
83-
venv_launcher_path.unlink()
84-
launcher = launcher.replace(
85-
'--python.Executable=',
86-
f'--python.Executable={venv_launcher_path.absolute()} --python.BaseExecutable=',
87-
)
88-
venv_launcher_path.write_text(launcher)
89-
venv_launcher_path.chmod(0o755)
90-
run([str(venv_launcher_path), '-m', 'ensurepip', '--default-pip'])
9179
run_in_venv(venv, ["pip", "install", "pytest", "pytest-xdist", "pytest-rerunfailures!=16.0", "filelock"])
9280
env = env or os.environ.copy()
9381
env["SETUPTOOLS_SCM_PRETEND_VERSION"] = "0.9.0"

‎mx.graalpython/mx_graalpython.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,11 +1019,10 @@ def graalvm_vm_arg(java_arg):
10191019
if sys.platform != 'win32':
10201020
coverage_launcher = original_launcher + "_cov"
10211021
c_launcher_source = coverage_launcher + ".c"
1022-
exe_arg = f"--python.Executable={coverage_launcher}"
10231022
agent_args_list = shlex.split(agent_args)
10241023
extra_args_c = []
1025-
for i, arg in enumerate(agent_args_list):
1026-
extra_args_c.append(f'new_args[{i + 3}] = "' + arg.replace("\"", r"\"") + '";')
1024+
for arg in agent_args_list:
1025+
extra_args_c.append('new_args[arg_index++] = "' + arg.replace("\"", r"\"") + '";')
10271026
extra_args_c = ' '.join(extra_args_c)
10281027
c_code = dedent(f"""\
10291028
#include <stdio.h>
@@ -1032,14 +1031,14 @@ def graalvm_vm_arg(java_arg):
10321031
10331032
int main(int argc, char **argv) {{
10341033
char *new_args[argc + 3 + {len(agent_args_list)}];
1035-
new_args[0] = "{original_launcher}";
1036-
new_args[1] = "--jvm";
1037-
new_args[2] = "{exe_arg}";
1034+
int arg_index = 0;
1035+
new_args[arg_index++] = argv[0];
1036+
new_args[arg_index++] = "--jvm";
10381037
{extra_args_c}
10391038
for (int i = 1; i < argc; i++) {{
1040-
new_args[i + 3 + {len(agent_args_list)}] = argv[i];
1039+
new_args[arg_index++] = argv[i];
10411040
}}
1042-
new_args[argc + 3 + {len(agent_args_list)}] = NULL;
1041+
new_args[arg_index] = NULL;
10431042
execvp("{original_launcher}", new_args);
10441043
perror("execvp failed");
10451044
return 1;

‎mx.graalpython/suite.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@
5353
},
5454
{
5555
"name": "tools",
56-
"version": "b862bbf602252edc38d61ab86191a2fb5cfacd76",
56+
"version": "409216ac4092720a775d85f51315f080bfa9766f",
5757
"subdir": True,
5858
"urls": [
5959
{"url": "https://github.com/oracle/graal", "kind": "git"},
6060
],
6161
},
6262
{
6363
"name": "regex",
64-
"version": "b862bbf602252edc38d61ab86191a2fb5cfacd76",
64+
"version": "409216ac4092720a775d85f51315f080bfa9766f",
6565
"subdir": True,
6666
"urls": [
6767
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)