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

[MPP] Remove mingwx86 from CommonizerIT.commonizeMultipleCInteropsWithTests

Browse Source 
^KT-58822
This commit is contained in:
Timofey Solonin
2023-06-13 14:09:10 +02:00
committed by Space Team
parent 89c8392255
commit e39d9c2c35
2 changed files with 36 additions and 76 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
+34 -61
View File
@@ -425,9 +425,7 @@ open class CommonizerIT : BaseGradleIT() {
private fun `test multiple cinterops with test source sets and compilations`(testSourceSetsDependingOnMain: Boolean) {
with(Project("commonizeMultipleCInteropsWithTests", minLogLevel = INFO)) {
val isUnix = HostManager.hostIsMac || HostManager.hostIsLinux
val isMac = HostManager.hostIsMac
val isWindows = HostManager.hostIsMingw
fun CompiledProject.assertTestSourceSetsDependingOnMainParameter() {
val message = "testSourceSetsDependingOnMain is set"
@@ -447,44 +445,42 @@ open class CommonizerIT : BaseGradleIT() {
getCommonizerDependencies("nativeMain").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper")
assertTargetOnAllDependencies(
CommonizerTarget(IOS_X64, IOS_ARM64, LINUX_X64, LINUX_ARM64, MACOS_X64, MINGW_X64, MINGW_X86)
CommonizerTarget(IOS_X64, IOS_ARM64, LINUX_X64, LINUX_ARM64, MACOS_X64, MINGW_X64)
)
}
getCommonizerDependencies("nativeTest").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*nativeTestHelper")
assertTargetOnAllDependencies(
CommonizerTarget(IOS_X64, IOS_ARM64, LINUX_X64, LINUX_ARM64, MACOS_X64, MINGW_X64, MINGW_X86)
CommonizerTarget(IOS_X64, IOS_ARM64, LINUX_X64, LINUX_ARM64, MACOS_X64, MINGW_X64)
)
}
if (isUnix) {
getCommonizerDependencies("unixMain").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper")
assertTargetOnAllDependencies(CommonizerTarget(IOS_X64, IOS_ARM64, LINUX_X64, LINUX_ARM64, MACOS_X64))
}
getCommonizerDependencies("unixTest").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper", ".*nativeTestHelper")
assertTargetOnAllDependencies(CommonizerTarget(IOS_X64, IOS_ARM64, LINUX_X64, LINUX_ARM64, MACOS_X64))
}
getCommonizerDependencies("linuxMain").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper")
assertTargetOnAllDependencies(CommonizerTarget(LINUX_X64, LINUX_ARM64))
}
getCommonizerDependencies("linuxTest").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper", ".*nativeTestHelper")
assertTargetOnAllDependencies(CommonizerTarget(LINUX_X64, LINUX_ARM64))
}
getCommonizerDependencies("linuxX64Main").assertEmpty()
getCommonizerDependencies("linuxArm64Main").assertEmpty()
getCommonizerDependencies("linuxX64Test").assertEmpty()
getCommonizerDependencies("linuxArm64Test").assertEmpty()
getCommonizerDependencies("unixMain").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper")
assertTargetOnAllDependencies(CommonizerTarget(IOS_X64, IOS_ARM64, LINUX_X64, LINUX_ARM64, MACOS_X64))
}
getCommonizerDependencies("unixTest").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper", ".*nativeTestHelper")
assertTargetOnAllDependencies(CommonizerTarget(IOS_X64, IOS_ARM64, LINUX_X64, LINUX_ARM64, MACOS_X64))
}
getCommonizerDependencies("linuxMain").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper")
assertTargetOnAllDependencies(CommonizerTarget(LINUX_X64, LINUX_ARM64))
}
getCommonizerDependencies("linuxTest").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper", ".*nativeTestHelper")
assertTargetOnAllDependencies(CommonizerTarget(LINUX_X64, LINUX_ARM64))
}
getCommonizerDependencies("linuxX64Main").assertEmpty()
getCommonizerDependencies("linuxArm64Main").assertEmpty()
getCommonizerDependencies("linuxX64Test").assertEmpty()
getCommonizerDependencies("linuxArm64Test").assertEmpty()
if (isMac) {
getCommonizerDependencies("appleMain").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper", ".*appleHelper")
@@ -516,22 +512,8 @@ open class CommonizerIT : BaseGradleIT() {
getCommonizerDependencies("iosArm64Test").assertEmpty()
}
if (isWindows) {
getCommonizerDependencies("windowsMain").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*windowsHelper")
assertTargetOnAllDependencies(CommonizerTarget(MINGW_X86, MINGW_X64))
}
getCommonizerDependencies("windowsTest").withoutNativeDistributionDependencies().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*windowsHelper", ".*nativeTestHelper")
assertTargetOnAllDependencies(CommonizerTarget(MINGW_X86, MINGW_X64))
}
getCommonizerDependencies("windowsX64Main").assertEmpty()
getCommonizerDependencies("windowsX64Test").assertEmpty()
getCommonizerDependencies("windowsX86Main").assertEmpty()
getCommonizerDependencies("windowsX86Test").assertEmpty()
}
getCommonizerDependencies("windowsX64Main").assertEmpty()
getCommonizerDependencies("windowsX64Test").assertEmpty()
}
build(":assemble", options = testSourceSetsDependingOnMainParameterOption) {
@@ -547,16 +529,14 @@ open class CommonizerIT : BaseGradleIT() {
assertSuccessful()
}
if (isUnix) {
build(":compileUnixMainKotlinMetadata", options = testSourceSetsDependingOnMainParameterOption) {
assertTestSourceSetsDependingOnMainParameter()
assertSuccessful()
}
build(":compileUnixMainKotlinMetadata", options = testSourceSetsDependingOnMainParameterOption) {
assertTestSourceSetsDependingOnMainParameter()
assertSuccessful()
}
build(":compileLinuxMainKotlinMetadata", options = testSourceSetsDependingOnMainParameterOption) {
assertTestSourceSetsDependingOnMainParameter()
assertSuccessful()
}
build(":compileLinuxMainKotlinMetadata", options = testSourceSetsDependingOnMainParameterOption) {
assertTestSourceSetsDependingOnMainParameter()
assertSuccessful()
}
if (isMac) {
@@ -570,13 +550,6 @@ open class CommonizerIT : BaseGradleIT() {
assertSuccessful()
}
}
if (isWindows) {
build(":compileWindowsMainKotlinMetadata", options = testSourceSetsDependingOnMainParameterOption) {
assertTestSourceSetsDependingOnMainParameter()
assertSuccessful()
}
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/commonizeMultipleCInteropsWithTests/build.gradle.kts
+2 -15
View File
@@ -31,8 +31,6 @@ kotlin {
ios()
mingwX64("windowsX64")
@Suppress("DEPRECATION_ERROR")
mingwX86("windowsX86")
val commonMain by sourceSets.getting
val commonTest by sourceSets.getting
@@ -53,12 +51,8 @@ kotlin {
val macosTest by sourceSets.getting
val iosMain by sourceSets.getting
val iosTest by sourceSets.getting
val windowsMain by sourceSets.creating
val windowsTest by sourceSets.creating
val windowsX64Main by sourceSets.getting
val windowsX64Test by sourceSets.getting
val windowsX86Main by sourceSets.getting
val windowsX86Test by sourceSets.getting
commonMain {
-jvmMain
@@ -73,10 +67,7 @@ kotlin {
-linuxX64Main
}
}
-windowsMain {
-windowsX64Main
-windowsX86Main
}
-windowsX64Main
}
}
@@ -92,10 +83,7 @@ kotlin {
-linuxX64Test
}
}
-windowsTest {
-windowsX64Test
-windowsX86Test
}
-windowsX64Test
}
}
@@ -105,7 +93,6 @@ kotlin {
unixTest.dependsOn(unixMain)
appleTest.dependsOn(appleMain)
linuxTest.dependsOn(linuxMain)
windowsTest.dependsOn(windowsMain)
}
targets.withType<KotlinNativeTarget>().forEach { target ->