diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt index 64a8f8a32fd..54e641bd118 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt @@ -23,6 +23,7 @@ import kotlin.test.assertTrue * * @param [projectName] test project name in 'src/test/resources/testProject` directory. * @param [buildOptions] common Gradle build options + * @param [buildJdk] path to JDK build should run with. *Note*: providing it disables debug! */ fun KGPBaseTest.project( projectName: String, @@ -32,6 +33,7 @@ fun KGPBaseTest.project( addHeapDumpOptions: Boolean = true, enableGradleDebug: Boolean = false, projectPathAdditionalSuffix: String = "", + buildJdk: String? = null, test: TestProject.() -> Unit ): TestProject { val projectPath = setupProjectFromTestResources( @@ -50,6 +52,9 @@ fun KGPBaseTest.project( .withProjectDir(projectPath.toFile()) .withTestKitDir(testKitDir.toAbsolutePath().toFile()) .withGradleVersion(gradleVersion.version) + .also { + if (buildJdk != null) it.withEnvironment(mapOf("JAVA_HOME" to buildJdk)) + } val testProject = TestProject( gradleRunner,