From cba7154e8a42d173a4f056afca789b8a51da0f85 Mon Sep 17 00:00:00 2001
From: Timofey Solonin <timofey.solonin@jetbrains.com>
Date: Wed, 14 Jun 2023 21:43:56 +0200
Subject: [PATCH] [MPP] Remove broken execution test and replace obsolete
 targets in CommonizerIT with curl

^KT-58822
---
 .../jetbrains/kotlin/gradle/CommonizerIT.kt   | 47 +++++--------------
 .../src/nativeInterop/cinterop/curl.def       |  5 +-
 .../src/nativeInterop/cinterop/curl2.def      |  5 +-
 3 files changed, 15 insertions(+), 42 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt
index e3acfaf8406..c16c73b3299 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt
@@ -9,7 +9,6 @@ import groovy.json.StringEscapeUtils
 import org.gradle.api.logging.LogLevel.INFO
 import org.gradle.internal.os.OperatingSystem
 import org.jetbrains.kotlin.commonizer.CommonizerTarget
-import org.jetbrains.kotlin.gradle.testbase.TestVersions
 import org.jetbrains.kotlin.gradle.util.reportSourceSetCommonizerDependencies
 import org.jetbrains.kotlin.incremental.testingUtils.assertEqualDirectories
 import org.jetbrains.kotlin.konan.target.HostManager
@@ -171,33 +170,13 @@ open class CommonizerIT : BaseGradleIT() {
                 assertSuccessful()
             }
 
-            if (CommonizableTargets.targetA.isCompilable) {
-                // targetA will be macos
-                build(":targetABinaries") {
-                    assertSuccessful()
-                }
+            // targetA will be macos
+            build(":compileTestKotlinTargetA") {
+                assertSuccessful()
             }
-            if (CommonizableTargets.targetB.isCompilable) {
-                //targetB will be linuxArm64
-                build(":targetBBinaries") {
-                    assertSuccessful()
-                }
-            }
-        }
-    }
-
-    @Test
-    fun `test commonizeCurlInterop execution`() {
-        with(preparedProject("commonizeCurlInterop")) {
-            if (CommonizableTargets.targetA.isExecutable) {
-                build(":targetATest") {
-                    assertSuccessful()
-                }
-            }
-            if (CommonizableTargets.targetB.isExecutable) {
-                build(":targetBTest") {
-                    assertSuccessful()
-                }
+            //targetB will be linuxArm64
+            build(":compileTestKotlinTargetB") {
+                assertSuccessful()
             }
         }
     }
@@ -721,7 +700,7 @@ open class CommonizerIT : BaseGradleIT() {
     }
 }
 
-private data class TargetSubstitution(val value: String, val isCompilable: Boolean, val isExecutable: Boolean) {
+private data class TargetSubstitution(val value: String) {
     override fun toString(): String = value
 }
 
@@ -729,16 +708,16 @@ private object CommonizableTargets {
     private val os = OperatingSystem.current()
 
     val targetA = when {
-        os.isMacOsX -> TargetSubstitution("macosX64", isCompilable = true, isExecutable = true)
-        os.isLinux -> TargetSubstitution("linuxX64", isCompilable = true, isExecutable = true)
-        os.isWindows -> TargetSubstitution("mingwX64", isCompilable = true, isExecutable = false)
+        os.isMacOsX -> TargetSubstitution("macosX64")
+        os.isLinux -> TargetSubstitution("linuxX64")
+        os.isWindows -> TargetSubstitution("mingwX64")
         else -> fail("Unsupported os: ${os.name}")
     }
 
     val targetB = when {
-        os.isMacOsX -> TargetSubstitution("linuxX64", isCompilable = true, isExecutable = false)
-        os.isLinux -> TargetSubstitution("linuxArm64", isCompilable = true, isExecutable = false)
-        os.isWindows -> TargetSubstitution("mingwX86", isCompilable = true, isExecutable = false)
+        os.isMacOsX -> TargetSubstitution("linuxX64")
+        os.isLinux -> TargetSubstitution("linuxArm64")
+        os.isWindows -> TargetSubstitution("linuxX64")
         else -> fail("Unsupported os: ${os.name}")
     }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def
index 648c1b28fdf..e4e34904ced 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def
@@ -1,6 +1,3 @@
 headers = curl/curl.h
 headerFilter = curl/*
-compilerOpts = -Ilibs/include
-
-linkerOpts.osx = -L/opt/local/lib -L/usr/local/opt/curl/lib -lcurl
-linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -L/usr/lib64 -lcurl
+compilerOpts = -Ilibs/include
\ No newline at end of file
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def
index 648c1b28fdf..e4e34904ced 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def
@@ -1,6 +1,3 @@
 headers = curl/curl.h
 headerFilter = curl/*
-compilerOpts = -Ilibs/include
-
-linkerOpts.osx = -L/opt/local/lib -L/usr/local/opt/curl/lib -lcurl
-linkerOpts.linux = -L/usr/lib/x86_64-linux-gnu -L/usr/lib64 -lcurl
+compilerOpts = -Ilibs/include
\ No newline at end of file