kargashinsky/mute-unresolved-target-tests-mac

[Gradle][Tests] Fix CommonNativeIT testData

[Gradle][Tests] Mute 2 native tests on Mac host

- Since 1.7.20 kotlinVersion Mac host can compile all native targets,
so tests with "unsupported targets" on Mac are obsolete.

Merge-request: KT-MR-7133
Merged-by: Pavel Kargashinsky <Pavel.Kargashinsky@jetbrains.com>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.konan.target.KonanTarget
 import org.jetbrains.kotlin.test.RunnerWithMuteInDatabase
 import org.junit.After
 import org.junit.AfterClass
+import org.junit.Assume
 import org.junit.Before
 import org.junit.runner.RunWith
 import java.io.File
@@ -243,6 +244,8 @@ abstract class BaseGradleIT {
                 "Could not stop some daemons ${(DaemonRegistry.activeDaemons).joinToString()}"
             }
         }
+
+        fun hostHaveUnsupportedTarget() = Assume.assumeFalse(HostManager.hostIsMac)
     }
 
     // the second parameter is for using with ToolingAPI, that do not like --daemon/--no-daemon  options at all

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/GeneralNativeIT.kt

@@ -985,6 +985,7 @@ class GeneralNativeIT : BaseGradleIT() {
 
     @Test
     fun testIgnoreDisabledNativeTargets() = with(Project("sample-lib", directoryPrefix = "new-mpp-lib-and-app")) {
+        hostHaveUnsupportedTarget()
         build {
             assertSuccessful()
             assertEquals(1, output.lines().count { DISABLED_NATIVE_TARGETS_REPORTER_WARNING_PREFIX in it })

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/NativePlatformLibsIT.kt

@@ -174,14 +174,10 @@ class NativePlatformLibsIT : BaseGradleIT() {
 
     @Test
     fun testNoGenerationForUnsupportedHost() {
+        hostHaveUnsupportedTarget()
         deleteInstalledCompilers()
 
-        val unsupportedTarget = when {
-            HostManager.hostIsMac -> KonanTarget.LINUX_MIPSEL32
-            else -> KonanTarget.IOS_X64
-        }
-
-        platformLibrariesProject(unsupportedTarget.presetName).buildWithLightDist("assemble") {
+        platformLibrariesProject(KonanTarget.IOS_X64.presetName).buildWithLightDist("assemble") {
             assertSuccessful()
             assertNotContains("Generate platform libraries for ")
         }

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/app/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform").version("<pluginMarkerVersion>")
+    id("org.jetbrains.kotlin.multiplatform")
 }
 
 repositories {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    kotlin("multiplatform").apply(false)
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/lib/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform").version("<pluginMarkerVersion>")
+    id("org.jetbrains.kotlin.multiplatform")
     id("maven-publish")
 }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-ios/settings.gradle.kts

@@ -1,2 +1,2 @@
 include(":app")
-include(":lib")
+include(":lib")

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/app/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform").version("<pluginMarkerVersion>")
+    id("org.jetbrains.kotlin.multiplatform")
 }
 
 repositories {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    kotlin("multiplatform").apply(false)
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-tvos/lib/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform").version("<pluginMarkerVersion>")
+    id("org.jetbrains.kotlin.multiplatform")
     id("maven-publish")
 }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/app/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform").version("<pluginMarkerVersion>")
+    id("org.jetbrains.kotlin.multiplatform")
 }
 
 repositories {

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/build.gradle.kts

@@ -0,0 +1,8 @@
+plugins {
+    kotlin("multiplatform").apply(false)
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-apple-devices-common/common-watchos/lib/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    id("org.jetbrains.kotlin.multiplatform").version("<pluginMarkerVersion>")
+    id("org.jetbrains.kotlin.multiplatform")
     id("maven-publish")
 }