From 9449e235386d4e4f9e3b0caff4fd12b269179fc2 Mon Sep 17 00:00:00 2001
From: Pavel Kargashinsky <pavel.kargashinsky@jetbrains.com>
Date: Mon, 22 May 2023 09:19:09 +0200
Subject: [PATCH] [FunctionalTests] Fix run
 ExternalAndroidTargetPropertySmokeTest on Windows

---
 .../tcs/ExternalAndroidTargetPrototypeSmokeTest.kt          | 4 +---
 .../kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/ExternalAndroidTargetPrototypeSmokeTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/ExternalAndroidTargetPrototypeSmokeTest.kt
index 14a0edc814b..042b158ab8d 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/ExternalAndroidTargetPrototypeSmokeTest.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/ExternalAndroidTargetPrototypeSmokeTest.kt
@@ -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
diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt
index c4eae4018a6..148e6019ca3 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt
@@ -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) {