azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow enabling build cache debug information.

Browse Source 
^KT-45745 In Progress
This commit is contained in:
Yahor Berdnikau
2021-08-06 15:27:26 +02:00
parent e949a0d38d
commit 3d4186bdb1
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt
+29 -16
View File
@@ -76,22 +76,24 @@ fun TestProject.build(
vararg buildArguments: String,
forceOutput: Boolean = this.forceOutput,
enableGradleDebug: Boolean = this.enableGradleDebug,
enableBuildCacheDebug: Boolean = false,
buildOptions: KGPBaseTest.BuildOptions = this.buildOptions,
assertions: BuildResult.() -> Unit = {}
) {
val allBuildArguments = commonBuildSetup(
buildArguments.toList(),
buildOptions,
enableBuildCacheDebug,
gradleVersion
)
val gradleRunnerForBuild = gradleRunner
.also { if (forceOutput) it.forwardOutput() }
.withDebug(enableGradleDebug)
.withArguments(allBuildArguments)
val buildResult = withBuildSummary(allBuildArguments) {
gradleRunnerForBuild.build()
withBuildSummary(allBuildArguments) {
val buildResult = gradleRunnerForBuild.build()
assertions(buildResult)
}
assertions(buildResult)
}
/**
@@ -101,23 +103,25 @@ fun TestProject.buildAndFail(
vararg buildArguments: String,
forceOutput: Boolean = this.forceOutput,
enableGradleDebug: Boolean = this.enableGradleDebug,
enableBuildCacheDebug: Boolean = false,
buildOptions: KGPBaseTest.BuildOptions = this.buildOptions,
assertions: BuildResult.() -> Unit = {}
) {
val allBuildArguments = commonBuildSetup(
buildArguments.toList(),
buildOptions,
enableBuildCacheDebug,
gradleVersion
)
val gradleRunnerForBuild = gradleRunner
.also { if (forceOutput) it.forwardOutput() }
.withDebug(enableGradleDebug)
.withArguments(allBuildArguments)
val buildResult = withBuildSummary(allBuildArguments) {
gradleRunnerForBuild.buildAndFail()
withBuildSummary(allBuildArguments) {
val buildResult = gradleRunnerForBuild.buildAndFail()
assertions(buildResult)
}
assertions(buildResult)
}
fun TestProject.enableLocalBuildCache(
@@ -168,23 +172,32 @@ class TestProject(
private fun commonBuildSetup(
buildArguments: List<String>,
buildOptions: KGPBaseTest.BuildOptions,
enableBuildCacheDebug: Boolean,
gradleVersion: GradleVersion
): List<String> {
val buildOptionsArguments = buildOptions.toArguments(gradleVersion)
return buildOptionsArguments + buildArguments + "--full-stacktrace"
val buildCacheDebugOption = if (enableBuildCacheDebug) "-Dorg.gradle.caching.debug=true" else null
return buildOptionsArguments +
buildArguments +
listOfNotNull(
"--full-stacktrace",
buildCacheDebugOption
)
}
private fun TestProject.withBuildSummary(
buildArguments: List<String>,
run: () -> BuildResult
): BuildResult = try {
run()
} catch (t: Throwable) {
println("<=== Test build: $projectName ===>")
println("<=== Using Gradle version: ${gradleVersion.version} ===>")
println("<=== Run arguments: ${buildArguments.joinToString()} ===>")
println("<=== Project path: ${projectPath.toAbsolutePath()} ===>")
throw t
run: () -> Unit
) {
try {
run()
} catch (t: Throwable) {
println("<=== Test build: $projectName ===>")
println("<=== Using Gradle version: ${gradleVersion.version} ===>")
println("<=== Run arguments: ${buildArguments.joinToString()} ===>")
println("<=== Project path: ${projectPath.toAbsolutePath()} ===>")
throw t
}
}
/**