Skip to content

Commit 7886fc2

Browse files
authored
Merge pull request #370 from jerboaa/warnings_logs_jdk25_and_up
Allow list new warnings message on JDK 25+
2 parents 377e9bf + 92a8506 commit 7886fc2

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

testsuite/src/it/java/org/graalvm/tests/integration/utils/WhitelistLogLines.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,9 @@ public Pattern[] get(boolean inContainer) {
218218
if (IS_THIS_MACOS && "true".equalsIgnoreCase(System.getenv("GITHUB_ACTIONS"))) {
219219
p.add(Pattern.compile(".*Netty DefaultChannelId initialization \\(with io\\.netty\\.machineId.*\\) took more than a second.*"));
220220
}
221-
// GraalVM 26 adds a warning count at the end of the build output. See https://github.com/oracle/graal/pull/12162
222-
if (UsedVersion.getVersion(inContainer).compareTo(Version.create(26, 0, 0)) >= 0) {
221+
// GraalVM 26 or graal/master that is Labs JDK 25 based adds a warning count at the end of the build output.
222+
// See https://github.com/oracle/graal/pull/12162
223+
if (UsedVersion.getVersion(inContainer).compareTo(Version.create(25, 0, 0)) >= 0) {
223224
p.add(Pattern.compile(".*The build process encountered 1 warning\\..*"));
224225
}
225226
return p.toArray(new Pattern[0]);
@@ -355,8 +356,9 @@ public Pattern[] get(boolean inContainer) {
355356
p.add(Pattern.compile(".*WARNING: sun.misc.Unsafe::invokeCleaner has been called by .*nonapi.io.github.classgraph.utils.FileUtils.*"));
356357
p.add(Pattern.compile(".*WARNING: Please consider reporting this to the maintainers of class .*nonapi.io.github.classgraph.utils.FileUtils"));
357358
p.add(Pattern.compile(".*WARNING: sun.misc.Unsafe::invokeCleaner will be removed in a future release"));
358-
// GraalVM 26 adds a warning count at the end of the build output. See https://github.com/oracle/graal/pull/12162
359-
if (UsedVersion.getVersion(inContainer).compareTo(Version.create(26, 0, 0)) >= 0) {
359+
// GraalVM 26 or graal/master that is Labs JDK 25 based adds a warning count at the end of the build output.
360+
// See https://github.com/oracle/graal/pull/12162
361+
if (UsedVersion.getVersion(inContainer).compareTo(Version.create(25, 0, 0)) >= 0) {
360362
p.add(Pattern.compile(".*The build process encountered 9 warnings\\..*"));
361363
}
362364
return p.toArray(new Pattern[0]);
@@ -435,8 +437,9 @@ public Pattern[] get(boolean inContainer) {
435437
p.add(Pattern.compile(".*WARNING: sun.misc.Unsafe::arrayBaseOffset will be removed in a future release"));
436438
}
437439
}
438-
// GraalVM 26 adds a warning count at the end of the build output. See https://github.com/oracle/graal/pull/12162
439-
if (UsedVersion.getVersion(inContainer).compareTo(Version.create(26, 0, 0)) >= 0) {
440+
// GraalVM 26 or graal/master that is Labs JDK 25 based adds a warning count at the end of the build output.
441+
// See https://github.com/oracle/graal/pull/12162
442+
if (UsedVersion.getVersion(inContainer).compareTo(Version.create(25, 0, 0)) >= 0) {
440443
p.add(Pattern.compile(".*The build process encountered 1 warning\\..*"));
441444
}
442445
return p.toArray(new Pattern[0]);

0 commit comments

Comments
 (0)