From 79d5c87f3036c5ce24e280ee43a648af947fe576 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 7 Feb 2022 17:03:06 +0100 Subject: [PATCH] [stdlib-mpp] Disable test retries for MPP libraries Not compatible with org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest executer. #KT-56106 --- build.gradle.kts | 5 +++++ .../src/main/kotlin/common-configuration.gradle.kts | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 360e9248453..ed05c0d423b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -356,6 +356,11 @@ val coreLibProjects by extra { ":kotlin-reflect" ) } +val mppProjects by extra { + listOf( + ":kotlin-stdlib-mpp", + ) +} val projectsWithEnabledContextReceivers by extra { listOf( diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts index 1b125039bf4..3fd30e4a9a1 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/common-configuration.gradle.kts @@ -294,8 +294,10 @@ fun Project.configureTests() { // Aggregate task for build related checks tasks.register("checkBuild") - - configureTestRetriesForTestTasks() + val mppProjects: List by rootProject.extra + if (path !in mppProjects) { + configureTestRetriesForTestTasks() + } } // TODO: migrate remaining modules to the new JVM default scheme.