Skip to content

Commit 3bfe834

Browse files
committed
[GR-59050] Switch Truffle native-image TCK gates to JDK latest.
PullRequest: js/3419
2 parents b945584 + 1cec8b5 commit 3bfe834

File tree

5 files changed

+42
-10
lines changed

5 files changed

+42
-10
lines changed

common.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545

4646
"oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]},
4747

48-
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+10", "platformspecific": true, "extrabundles": ["static-libs"]},
49-
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+10-jvmci-b01", "platformspecific": true },
50-
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+10-jvmci-b01-debug", "platformspecific": true },
51-
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+10-jvmci-b01-sulong", "platformspecific": true },
52-
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+10-jvmci-b01", "platformspecific": true },
53-
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+10-jvmci-b01-debug", "platformspecific": true },
54-
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+10-jvmci-b01-sulong", "platformspecific": true }
48+
"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+11", "platformspecific": true, "extrabundles": ["static-libs"]},
49+
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01", "platformspecific": true },
50+
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-debug", "platformspecific": true },
51+
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-sulong", "platformspecific": true },
52+
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01", "platformspecific": true },
53+
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-debug", "platformspecific": true },
54+
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-sulong", "platformspecific": true }
5555
},
5656

5757
"eclipse": {

graal-js/ci.jsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ local ci = import '../ci.jsonnet';
156156

157157
// downstream graal gate
158158
graalJs + downstreamGraal + {name: 'downstream-graal'} +
159-
promoteToTarget(common.gate, [common.jdk21 + common.linux_amd64]) +
160-
excludePlatforms([common.jdklatest]), # GR-60309: fails on JDK 24
159+
promoteToTarget(common.gate, [ci.mainGatePlatform]) +
160+
includePlatforms([ci.mainGatePlatform]), # GR-62152: language permissions tool supports only linux
161161
graalJs + downstreamSubstratevmEE + {environment+: {TAGS: 'downtest_js'}} + {name: 'downstream-substratevm-enterprise'} + gateOnMain +
162162
excludePlatforms([common.darwin_amd64]) + # Too slow
163163
excludePlatforms([common.linux_aarch64]), # Fails on Linux AArch64 with "Creation of the VM failed."

graal-js/mx.graal-js/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{
2626
"name" : "regex",
2727
"subdir" : True,
28-
"version" : "804dab21e1ebb363172794e9be20b5ea070d807d",
28+
"version" : "f0233ee235f3ba5d3e5ed7b84cf0ba29d04b2376",
2929
"urls" : [
3030
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3131
]

graal-js/mx.graal-js/truffle.tck.permissions/icu_excludes.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@
3232
"justification" : "Reflectively calls java.util.Locale#getDefault(Category)."
3333
}
3434
]
35+
}, {
36+
"name" : "org.graalvm.shadowed.com.ibm.icu.impl.ICUConfig",
37+
"methods" : [
38+
{ "name" : "get",
39+
"justification" : "Read a system property to get ICU configuration.",
40+
"parameterTypes" : [
41+
"java.lang.String",
42+
"java.lang.String"
43+
]
44+
}
45+
]
3546
}, {
3647
"name" : "org.graalvm.shadowed.com.ibm.icu.impl.URLHandler",
3748
"methods" : [

graal-js/mx.graal-js/truffle.tck.permissions/js_excludes.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,27 @@
77
}
88
]
99
},
10+
{
11+
"name" : "com.oracle.truffle.js.builtins.DebugBuiltins$DebugSystemProperty",
12+
"methods" : [
13+
{ "name" : "systemProperty",
14+
"parameterTypes" : [
15+
"java.lang.Object"
16+
],
17+
"justification" : "Debug builtin that needs to be enabled by the js.debug-builtin option."
18+
}
19+
]
20+
},
21+
{
22+
"name" : "com.oracle.truffle.js.builtins.DebugBuiltins$DebugSystemProperties",
23+
"methods" : [
24+
{ "name" : "systemProperties",
25+
"parameterTypes" : [
26+
],
27+
"justification" : "Debug builtin that needs to be enabled by the js.debug-builtin option."
28+
}
29+
]
30+
},
1031
{
1132
"name" : "com.oracle.truffle.js.runtime.util.DebugJSAgent",
1233
"methods" : [

0 commit comments

Comments
 (0)