diff --git a/libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts b/libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts index 7fc4ae72b11..b658be77eaa 100644 --- a/libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/functionalTest.gradle.kts @@ -11,6 +11,10 @@ project.extensions.getByType().target.compilations { classpath = sourceSets["functionalTest"].runtimeClasspath workingDir = projectDir dependsOnKotlinGradlePluginInstall() + + testLogging { + events("passed", "skipped", "failed") + } } tasks.named("check") { dependsOn(functionalTest) diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/androidUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/androidUtils.kt new file mode 100644 index 00000000000..eeeb99f51d5 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/androidUtils.kt @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle + +import org.junit.Assume +import java.io.File + +val isAndroidSdkAvailable: Boolean = System.getenv("ANDROID_SDK_ROOT")?.let { root -> File(root).exists() } ?: false + +fun assumeAndroidSdkAvailable() { + Assume.assumeTrue("Missing android sdk", isAndroidSdkAvailable) +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt index 6aeb9800940..9a55ba005d2 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/kpm/idea/MviKotlinIdeaDependencyResolutionTest.kt @@ -11,6 +11,7 @@ import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin import org.jetbrains.kotlin.commonizer.stdlib import org.jetbrains.kotlin.gradle.android.androidPrototype +import org.jetbrains.kotlin.gradle.assumeAndroidSdkAvailable import org.jetbrains.kotlin.gradle.kpm.applyKpmPlugin import org.jetbrains.kotlin.gradle.kpm.buildIdeaKotlinProjectModel import org.jetbrains.kotlin.gradle.kpm.idea.IdeaKotlinDependency.Companion.CLASSPATH_BINARY_TYPE @@ -174,6 +175,7 @@ class MviKotlinIdeaDependencyResolutionTest : AbstractLightweightIdeaDependencyR @Test fun `test - android and jvm`() { + assumeAndroidSdkAvailable() val project = buildProject() /* Setup Android */