From e13fece0cd384165539e42005289103188b18532 Mon Sep 17 00:00:00 2001 From: "Vadim.Mishenev" Date: Sat, 4 Nov 2023 20:33:02 +0200 Subject: [PATCH] Introduce environment variable to disable tests --- .../org/jetbrains/dokka/it/gradle/TestedVersions.kt | 12 +++++++++--- .../org/jetbrains/dokka/it/gradle/TestEnvironment.kt | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt index cd7b5706a0..0724a1858c 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt @@ -12,7 +12,7 @@ import java.util.stream.Stream const val useK2PropertyCLIArgument = "-Porg.jetbrains.dokka.useK2=true" internal class LatestTestedVersionsArgumentsProvider : TestedVersionsArgumentsProvider(listOf(TestedVersions.LATEST)) internal open class AllSupportedTestedVersionsArgumentsProvider : TestedVersionsArgumentsProvider(TestedVersions.ALL_SUPPORTED) -internal open class AllSupportedTestedVersionsWithK2SwitcherArgumentsProvider : TestedVersionsWithK2SwitcherArgumentsProvider(listOf(TestedVersions.LATEST)) +internal open class AllSupportedTestedVersionsWithK2SwitcherArgumentsProvider : TestedVersionsWithK2SwitcherArgumentsProvider(TestedVersions.ALL_SUPPORTED) internal object TestedVersions { @@ -76,8 +76,14 @@ abstract class TestedVersionsArgumentsProvider(private val buildVersions: List) : ArgumentsProvider { +internal abstract class TestedVersionsWithK2SwitcherArgumentsProvider(private val buildVersions: List) : + ArgumentsProvider { override fun provideArguments(context: ExtensionContext?): Stream { - return (buildVersions.map { Arguments.of(it, "") } + buildVersions.map { Arguments.of(it, useK2PropertyCLIArgument) }).stream() + return (buildVersions.map { Arguments.of(it, "") } + if (TestEnvironment.disableK2Tests) emptyList() + else buildVersions.map { + Arguments.of( + it, useK2PropertyCLIArgument + ) + }).stream() } } diff --git a/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestEnvironment.kt b/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestEnvironment.kt index 174060aab7..962c640fc3 100644 --- a/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestEnvironment.kt +++ b/integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestEnvironment.kt @@ -8,6 +8,8 @@ public object TestEnvironment { public val isExhaustive: Boolean = checkNotNull(System.getenv("isExhaustive")) { "Missing `isExhaustive` environment variable" }.toBoolean() + + public val disableK2Tests: Boolean = System.getenv("DISABLE_K2_TESTS").toBoolean() } /**