Fix GraalVmStarterTests on CI

(cherry picked from commit 975eb5a)
junit-team · Jun 17, 2024 · 43ddd64 · 43ddd64
1 parent ff486cf
commit 43ddd64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryEr
   --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19,JDK20,JDK21,JDK22
+org.gradle.java.installations.fromEnv=JDK8,JDK18,JDK19,JDK20,JDK21,JDK22,GRAALVM_HOME
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 
 # Test Distribution

diff --git a/...oling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java b/...oling-support-tests/src/test/java/platform/tooling/support/tests/GraalVmStarterTests.java
@@ -49,7 +49,8 @@ void runsTestsInNativeImage() {
 		assertFalse(result.isTimedOut(), () -> "tool timed out: " + result);
 
 		assumeFalse(
-			result.getOutputLines("err").stream().anyMatch(line -> line.contains("No matching toolchains found")),
+			result.getOutputLines("err").stream().anyMatch(
+				line -> line.contains("No locally installed toolchains match")),
 			"Abort test if GraalVM is not installed");
 
 		assertEquals(0, result.getExitCode());