Revert "Detect native-image-compatible JDK using Gradle toolchains"

This reverts commit dbfc4fd

Author: marcphilipp

platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts

@@ -236,7 +236,6 @@ val test by testing.suites.getting(JvmTestSuite::class) {
 
 				val gradleJavaVersion = 21
 				jvmArgumentProviders += JavaHomeDir(project, gradleJavaVersion, develocity.testDistribution.enabled)
-				jvmArgumentProviders += JavaHomeDir(project, gradleJavaVersion, develocity.testDistribution.enabled, graalvm = true)
 				systemProperty("gradle.java.version", gradleJavaVersion)
 			}
 		}
@@ -263,18 +262,14 @@ class MavenRepo(project: Project, @get:Internal val repoDir: Provider<File>) : C
 	override fun asArguments() = listOf("-Dmaven.repo=${repoDir.get().absolutePath}")
 }
 
-class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEnabled: Provider<Boolean>, @Input val graalvm: Boolean = false) : CommandLineArgumentProvider {
+class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEnabled: Provider<Boolean>) : CommandLineArgumentProvider {
 
 	@Internal
 	val javaLauncher: Property<JavaLauncher> = project.objects.property<JavaLauncher>()
 			.value(project.provider {
 				try {
 					project.javaToolchains.launcherFor {
 						languageVersion = JavaLanguageVersion.of(version)
-						if (graalvm) {
-							vendor = GRAAL_VM
-							nativeImageCapable = true
-						}
 					}.get()
 				} catch (e: Exception) {
 					null
@@ -290,7 +285,7 @@ class JavaHomeDir(project: Project, @Input val version: Int, testDistributionEna
 		}
 		val metadata = javaLauncher.map { it.metadata }
 		val javaHome = metadata.map { it.installationPath.asFile.absolutePath }.orNull
-		return javaHome?.let { listOf("-Djava.home.$version${if (graalvm) ".nativeImage" else ""}=$it") } ?: emptyList()
+		return javaHome?.let { listOf("-Djava.home.$version=$it") } ?: emptyList()
 	}
 }
 

platform-tooling-support-tests/projects/graalvm-starter/gradle.properties

@@ -73,11 +73,6 @@ public static Optional<Path> getJavaHome(int version) {
 		return sources.filter(Objects::nonNull).findFirst().map(Path::of);
 	}
 
-	public static Optional<Path> getJavaHomeWithNativeImageSupport(int version) {
-		var value = System.getProperty("java.home." + version + ".nativeImage");
-		return Optional.ofNullable(value).map(Path::of);
-	}
-
 	private Helper() {
 	}
 }

platform-tooling-support-tests/src/main/java/platform/tooling/support/Helper.java

@@ -13,19 +13,17 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static platform.tooling.support.Helper.getJavaHomeWithNativeImageSupport;
-import static platform.tooling.support.ProcessStarters.getGradleJavaVersion;
 import static platform.tooling.support.tests.Projects.copyToWorkspace;
 
 import java.nio.file.Path;
 
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 import org.junit.jupiter.api.extension.DisabledOnOpenJ9;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.platform.tests.process.OutputFiles;
-import org.opentest4j.TestAbortedException;
 
 import platform.tooling.support.MavenRepo;
 import platform.tooling.support.ProcessStarters;
@@ -35,18 +33,15 @@
  */
 @Order(Integer.MIN_VALUE)
 @DisabledOnOpenJ9
+@EnabledIfEnvironmentVariable(named = "GRAALVM_HOME", matches = ".+")
 class GraalVmStarterTests {
 
 	@Test
 	@Timeout(value = 10, unit = MINUTES)
 	void runsTestsInNativeImage(@TempDir Path workspace, @FilePrefix("gradle") OutputFiles outputFiles)
 			throws Exception {
-
-		var graalVmHome = getJavaHomeWithNativeImageSupport(getGradleJavaVersion());
-
 		var result = ProcessStarters.gradlew() //
 				.workingDir(copyToWorkspace(Projects.GRAALVM_STARTER, workspace)) //
-				.putEnvironment("GRAALVM_HOME", graalVmHome.orElseThrow(TestAbortedException::new).toString()) //
 				.addArguments("-Dmaven.repo=" + MavenRepo.dir()) //
 				.addArguments("javaToolchains", "nativeTest", "--no-daemon", "--stacktrace", "--no-build-cache",
 					"--warning-mode=fail", "--refresh-dependencies") //