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

[MPP] Remove broken execution test and replace obsolete targets in CommonizerIT with curl

Browse Source 
^KT-58822
This commit is contained in:
Timofey Solonin
2023-06-14 21:43:56 +02:00
committed by Space Team
parent d5a02960d8
commit cba7154e8a
3 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt
+13 -34
View File
@@ -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}")
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl.def
+1 -4
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeCurlInterop/src/nativeInterop/cinterop/curl2.def
+1 -4
View File
@@ -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