azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FunctionalTests] Fix run ExternalAndroidTargetPropertySmokeTest on Windows

Browse Source
This commit is contained in:
Pavel Kargashinsky
2023-05-22 09:19:09 +02:00
committed by Space Team
parent 83865782ff
commit 9449e23538
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/ExternalAndroidTargetPrototypeSmokeTest.kt
+1 -3
View File
@@ -19,7 +19,6 @@ import org.jetbrains.kotlin.gradle.idea.testFixtures.tcs.binaryCoordinates
import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport import org.jetbrains.kotlin.gradle.plugin.ide.kotlinIdeMultiplatformImport
import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.gradle.util.*
import org.jetbrains.kotlin.gradle.utils.getByType import org.jetbrains.kotlin.gradle.utils.getByType
import org.junit.Assume
import org.junit.Test import org.junit.Test
import kotlin.test.BeforeTest import kotlin.test.BeforeTest
import kotlin.test.assertEquals import kotlin.test.assertEquals
@@ -29,8 +28,7 @@ class ExternalAndroidTargetPrototypeSmokeTest {
@BeforeTest @BeforeTest
fun checkSdk() { fun checkSdk() {
Assume.assumeFalse("Mute tests on Windows, KT-58608", org.gradle.internal.os.OperatingSystem.current().isWindows) assertAndroidSdkAvailable()
assumeAndroidSdkAvailable()
} }
@Test @Test
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt
+3 -3
View File
@@ -9,11 +9,11 @@ import org.gradle.api.Project
import org.junit.Assume import org.junit.Assume
import java.io.File import java.io.File
val androidSdk: String? = System.getProperty("android.sdk") val androidSdk: String? = System.getProperty("android.sdk")?.replace("\\", "/")
val isAndroidSdkAvailable: Boolean = androidSdk?.let { root -> File(root).exists() } ?: false
fun assumeAndroidSdkAvailable() { fun assumeAndroidSdkAvailable() {
Assume.assumeTrue("Missing android sdk", isAndroidSdkAvailable) Assume.assumeTrue("Missing android sdk in <$androidSdk> location.",
androidSdk?.let { root -> File(root).exists() } ?: false)
} }
fun setAndroidSdkDirProperty(project: Project) { fun setAndroidSdkDirProperty(project: Project) {