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 bf56521931e..64a8f8a32fd 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 @@ -71,9 +71,14 @@ fun TestProject.build( vararg buildArguments: String, forceOutput: Boolean = this.forceOutput, enableGradleDebug: Boolean = this.enableGradleDebug, + buildOptions: KGPBaseTest.BuildOptions = this.buildOptions, assertions: BuildResult.() -> Unit = {} ) { - val allBuildArguments = commonBuildSetup(buildArguments.toList()) + val allBuildArguments = commonBuildSetup( + buildArguments.toList(), + buildOptions, + gradleVersion + ) val gradleRunnerForBuild = gradleRunner .also { if (forceOutput) it.forwardOutput() } .withDebug(enableGradleDebug) @@ -91,9 +96,14 @@ fun TestProject.buildAndFail( vararg buildArguments: String, forceOutput: Boolean = this.forceOutput, enableGradleDebug: Boolean = this.enableGradleDebug, + buildOptions: KGPBaseTest.BuildOptions = this.buildOptions, assertions: BuildResult.() -> Unit = {} ) { - val allBuildArguments = commonBuildSetup(buildArguments.toList()) + val allBuildArguments = commonBuildSetup( + buildArguments.toList(), + buildOptions, + gradleVersion + ) val gradleRunnerForBuild = gradleRunner .also { if (forceOutput) it.forwardOutput() } .withDebug(enableGradleDebug) @@ -150,8 +160,10 @@ class TestProject( ): Path = classesDir(sourceSet, language = "kotlin") } -private fun TestProject.commonBuildSetup( - buildArguments: List +private fun commonBuildSetup( + buildArguments: List, + buildOptions: KGPBaseTest.BuildOptions, + gradleVersion: GradleVersion ): List { val buildOptionsArguments = buildOptions.toArguments(gradleVersion) return buildOptionsArguments + buildArguments + "--full-stacktrace"