Skip to content

Commit e663973

Browse files
ALikhachevSpace Team
authored andcommitted
[Gradle] Rework runToolInSeparateProcess
* Make it using JVM arguments file (@-file) on JDK 9+ for avoiding issues with too long command line on Windows * Remove testKotlinCompileInFolderWithSpaces We cover compiler execution against paths or classpath with spaces on the BTA layer. This test was introduced specifically for testing the utility function of running separate processes from KGP with command-line argument files ("@-files"). * Add a functional test for the utility function verification ^KT-80875 Fixed
1 parent 16371e7 commit e663973

File tree

14 files changed

+213
-104
lines changed

14 files changed

+213
-104
lines changed

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,6 @@ class KotlinGradleIT : KGPBaseTest() {
8585
}
8686
}
8787

88-
@DisplayName("Project path contains spaces")
89-
@GradleTest
90-
fun testKotlinCompileInFolderWithSpaces(gradleVersion: GradleVersion) {
91-
project(projectName = "Project Path With Spaces", gradleVersion) {
92-
build("build") {
93-
assertTasksExecuted(":compileKotlin", ":compileTestKotlin")
94-
assertOutputDoesNotContain("Forcing System.gc")
95-
}
96-
}
97-
}
98-
9988
@DisplayName("Logs contain memory usage entries on LIFECYCLE log level")
10089
@GradleTest
10190
fun testLogLevelForceGC(gradleVersion: GradleVersion) {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/build.gradle

Lines changed: 0 additions & 17 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/gradle.properties

Lines changed: 0 additions & 2 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/src/main/kotlin/Dummy.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/src/main/kotlin/Greeter.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/src/main/kotlin/KotlinGreetingJoiner.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/src/main/kotlin/dummyUtil.kt

Lines changed: 0 additions & 3 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/src/test/kotlin/TestGreeter.kt

Lines changed: 0 additions & 10 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/Project Path With Spaces/src/test/kotlin/TestKotlinGreetingJoiner.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ tasks.test {
3939
useJUnit {
4040
exclude("**/*LincheckTest.class")
4141
}
42+
val jdk8Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_1_8)
43+
val jdk11Provider = project.getToolchainJdkHomeFor(JdkMajorVersion.JDK_11_0)
44+
doFirst {
45+
systemProperty("jdk8Home", jdk8Provider.get())
46+
systemProperty("jdk11Home", jdk11Provider.get())
47+
}
4248
}
4349

4450
tasks.register<Test>("lincheckTest") {

0 commit comments

Comments
 (0)