From a9c6c115be4a64427c9e71fbff39da1fedb351cb Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 25 Feb 2021 10:37:43 +0300
Subject: [PATCH] [Test] Disable gradle test parallelization if JUnit 5 is
 enabled

---
 buildSrc/src/main/kotlin/tasks.kt            | 6 +++++-
 compiler/fir/analysis-tests/build.gradle.kts | 2 +-
 compiler/fir/fir2ir/build.gradle.kts         | 2 +-
 compiler/tests-common-new/build.gradle.kts   | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt
index 083970e0f04..a61cf59b0f9 100644
--- a/buildSrc/src/main/kotlin/tasks.kt
+++ b/buildSrc/src/main/kotlin/tasks.kt
@@ -70,6 +70,10 @@ fun Task.dependsOnKotlinGradlePluginPublish() {
     }
 }
 
+/**
+ * @param parallel is redundant if @param jUnit5Enabled is true, because
+ *   JUnit5 supports parallel test execution by itself, without gradle help
+ */
 fun Project.projectTest(
     taskName: String = "test",
     parallel: Boolean = false,
@@ -193,7 +197,7 @@ fun Project.projectTest(
         }
     }
 
-    if (parallel) {
+    if (parallel && !jUnit5Enabled) {
         maxParallelForks =
             project.findProperty("kotlin.test.maxParallelForks")?.toString()?.toInt()
                 ?: (Runtime.getRuntime().availableProcessors() / if (kotlinBuildProperties.isTeamcityBuild) 2 else 4).coerceAtLeast(1)
diff --git a/compiler/fir/analysis-tests/build.gradle.kts b/compiler/fir/analysis-tests/build.gradle.kts
index f9424147c9f..ee8f76f6360 100644
--- a/compiler/fir/analysis-tests/build.gradle.kts
+++ b/compiler/fir/analysis-tests/build.gradle.kts
@@ -78,7 +78,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     }
 }
 
-projectTest(parallel = true, jUnit5Enabled = true) {
+projectTest(jUnit5Enabled = true) {
     dependsOn(":dist")
     workingDir = rootDir
     jvmArgs!!.removeIf { it.contains("-Xmx") }
diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts
index 46b790ffc90..dc1ab96b00c 100644
--- a/compiler/fir/fir2ir/build.gradle.kts
+++ b/compiler/fir/fir2ir/build.gradle.kts
@@ -58,7 +58,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     }
 }
 
-projectTest(parallel = true, jUnit5Enabled = true) {
+projectTest(jUnit5Enabled = true) {
     workingDir = rootDir
     useJUnitPlatform()
 }
diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts
index eff15908156..52fe2b06003 100644
--- a/compiler/tests-common-new/build.gradle.kts
+++ b/compiler/tests-common-new/build.gradle.kts
@@ -69,7 +69,7 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
     }
 }
 
-projectTest(parallel = true, jUnit5Enabled = true) {
+projectTest(jUnit5Enabled = true) {
     dependsOn(":dist")
     workingDir = rootDir
     jvmArgs!!.removeIf { it.contains("-Xmx") }