Skip to content

Commit 64104b8

Browse files
committed
[GR-23997] Periodic update of the graal import (2022-06-03).
PullRequest: js/2475
2 parents 8a126d7 + 25f48b5 commit 64104b8

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

common.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44
"jdks": {
55
"openjdk11": {"name": "openjdk", "version": "11.0.11+9", "platformspecific": true },
66
"oraclejdk11": {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
7-
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.15+6-jvmci-22.2-b01", "platformspecific": true },
8-
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.15+6-jvmci-22.2-b01-sulong", "platformspecific": true },
9-
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.16+4-jvmci-22.2-b01", "platformspecific": true },
10-
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.16+4-jvmci-22.2-b01-sulong", "platformspecific": true },
7+
"labsjdk-ce-11": {"name": "labsjdk", "version": "ce-11.0.15+6-jvmci-22.2-b02", "platformspecific": true },
8+
"labsjdk-ce-11-llvm": {"name": "labsjdk", "version": "ce-11.0.15+6-jvmci-22.2-b02-sulong", "platformspecific": true },
9+
"labsjdk-ee-11": {"name": "labsjdk", "version": "ee-11.0.16+6-jvmci-22.2-b02", "platformspecific": true },
10+
"labsjdk-ee-11-llvm": {"name": "labsjdk", "version": "ee-11.0.16+6-jvmci-22.2-b02-sulong", "platformspecific": true },
1111

1212
"oraclejdk17": {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
13-
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.2-b01", "platformspecific": true },
14-
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.2-b01-debug", "platformspecific": true },
15-
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.3+4-jvmci-22.2-b01-sulong", "platformspecific": true },
16-
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.4+4-jvmci-22.2-b01", "platformspecific": true },
17-
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.4+4-jvmci-22.2-b01-debug", "platformspecific": true },
18-
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.4+4-jvmci-22.2-b01-sulong", "platformspecific": true }
13+
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.4+1-jvmci-22.2-b02", "platformspecific": true },
14+
"labsjdk-ce-17Debug": {"name": "labsjdk", "version": "ce-17.0.4+1-jvmci-22.2-b02-debug", "platformspecific": true },
15+
"labsjdk-ce-17-llvm": {"name": "labsjdk", "version": "ce-17.0.4+1-jvmci-22.2-b02-sulong", "platformspecific": true },
16+
"labsjdk-ee-17": {"name": "labsjdk", "version": "ee-17.0.4+6-jvmci-22.2-b02", "platformspecific": true },
17+
"labsjdk-ee-17Debug": {"name": "labsjdk", "version": "ee-17.0.4+6-jvmci-22.2-b02-debug", "platformspecific": true },
18+
"labsjdk-ee-17-llvm": {"name": "labsjdk", "version": "ee-17.0.4+6-jvmci-22.2-b02-sulong", "platformspecific": true }
1919
},
2020

2121
"COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
{
2525
"name" : "regex",
2626
"subdir" : True,
27-
"version" : "587c31f311b09ba9e398e182b8e3a6bcf832679c",
27+
"version" : "e760eb9b69bd02f93e2054dd30af3419b106e88c",
2828
"urls" : [
2929
{"url" : "https://github.com/oracle/graal.git", "kind" : "git"},
3030
{"url" : "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind" : "binary"},

graal-js/src/com.oracle.truffle.js.test/src/com/oracle/truffle/js/test/regress/GR32763.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* The Universal Permissive License (UPL), Version 1.0
@@ -59,7 +59,7 @@ public void testUnknownImportUrl() throws IOException {
5959

6060
@Test
6161
public void testSchemeNotSupported() throws IOException {
62-
assertErrorMessage("foo://bar.mjs", "Error: java.nio.file.FileSystemNotFoundException: Provider \"foo\" not installed\n");
62+
assertErrorMessage("foo://bar.mjs", "Error: Unsupported URI scheme foo\n");
6363
}
6464

6565
private static void assertErrorMessage(String importUrl, String expected) throws IOException {

0 commit comments

Comments
 (0)