Add support for one_line_per_test in new gradle setup
Also adjust parallelforks to match existing setup
Change-Id: I3ba0cfdc86c51e961e40a891139ceeb5b43d1934
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt b/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
index 4ca414d..dd05df3 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/TestConfigurationHelper.kt
@@ -3,6 +3,9 @@
// BSD-style license that can be found in the LICENSE file.
import org.gradle.api.tasks.testing.Test
+import org.gradle.api.tasks.testing.TestListener
+import org.gradle.api.tasks.testing.TestDescriptor
+import org.gradle.api.tasks.testing.TestResult
class TestConfigurationHelper {
@@ -69,6 +72,19 @@
test.maxHeapSize = "4G"
}
+ if (project.hasProperty("one_line_per_test")) {
+ test.addTestListener(object: TestListener {
+ override fun beforeSuite(desc: TestDescriptor?) { }
+ override fun afterSuite(desc: TestDescriptor?, result: TestResult?) { }
+ override fun beforeTest(desc: TestDescriptor?) {
+ println("Start executing ${desc}")
+ }
+ override fun afterTest(desc: TestDescriptor?, result: TestResult?) {
+ println("Done executing ${desc} with result: ${result?.resultType}")
+ }
+ })
+ }
+
val userDefinedCoresPerFork = System.getenv("R8_GRADLE_CORES_PER_FORK")
val processors = Runtime.getRuntime().availableProcessors()
// See https://docs.gradle.org/current/dsl/org.gradle.api.tasks.testing.Test.html.
@@ -78,8 +94,8 @@
// On work machines this seems to give the best test execution time (without freezing).
test.maxParallelForks = processors.div(3)
// On low cpu count machines (bots) we under subscribe, so increase the count.
- if (processors == 8) {
- test.maxParallelForks = 3
+ if (processors == 32) {
+ test.maxParallelForks = 15
}
}
}