[FunctionalTests] Fix run ExternalAndroidTargetPropertySmokeTest on Windows
This commit is contained in:
committed by
Space Team
parent
83865782ff
commit
9449e23538
+1
-3
@@ -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.util.*
|
||||
import org.jetbrains.kotlin.gradle.utils.getByType
|
||||
import org.junit.Assume
|
||||
import org.junit.Test
|
||||
import kotlin.test.BeforeTest
|
||||
import kotlin.test.assertEquals
|
||||
@@ -29,8 +28,7 @@ class ExternalAndroidTargetPrototypeSmokeTest {
|
||||
|
||||
@BeforeTest
|
||||
fun checkSdk() {
|
||||
Assume.assumeFalse("Mute tests on Windows, KT-58608", org.gradle.internal.os.OperatingSystem.current().isWindows)
|
||||
assumeAndroidSdkAvailable()
|
||||
assertAndroidSdkAvailable()
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+3
-3
@@ -9,11 +9,11 @@ import org.gradle.api.Project
|
||||
import org.junit.Assume
|
||||
import java.io.File
|
||||
|
||||
val androidSdk: String? = System.getProperty("android.sdk")
|
||||
val isAndroidSdkAvailable: Boolean = androidSdk?.let { root -> File(root).exists() } ?: false
|
||||
val androidSdk: String? = System.getProperty("android.sdk")?.replace("\\", "/")
|
||||
|
||||
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) {
|
||||
|
||||
Reference in New Issue
Block a user