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

[MPP] Remove unnecessary platform limitations in CommonizerHierarchicalIT

Browse Source 
^KT-58822
This commit is contained in:
Timofey Solonin
2023-06-07 21:09:35 +02:00
committed by Space Team
parent 7815eec7c1
commit 97e48eee7a
1 changed files with 33 additions and 52 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/CommonizerHierarchicalIT.kt
+33 -52
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.gradle package org.jetbrains.kotlin.gradle
import org.gradle.internal.os.OperatingSystem
import org.jetbrains.kotlin.konan.file.File import org.jetbrains.kotlin.konan.file.File
import org.jetbrains.kotlin.konan.target.HostManager
import org.junit.Test import org.junit.Test
open class CommonizerHierarchicalIT : BaseGradleIT() { open class CommonizerHierarchicalIT : BaseGradleIT() {
@@ -16,7 +16,7 @@ open class CommonizerHierarchicalIT : BaseGradleIT() {
fun `test commonizeHierarchically metadata compilations`() { fun `test commonizeHierarchically metadata compilations`() {
with(Project("commonizeHierarchically")) { with(Project("commonizeHierarchically")) {
if (Os.canCompileApple) { if (HostManager.hostIsMac) {
build(":p1:compileIosMainKotlinMetadata") { build(":p1:compileIosMainKotlinMetadata") {
assertSuccessful() assertSuccessful()
assertFileExists("p1/build/classes/kotlin/metadata/iosMain/klib/p1_iosMain.klib") assertFileExists("p1/build/classes/kotlin/metadata/iosMain/klib/p1_iosMain.klib")
@@ -30,41 +30,33 @@ open class CommonizerHierarchicalIT : BaseGradleIT() {
} }
} }
if (Os.canCompileLinux) { build(":p1:compileLinuxMainKotlinMetadata") {
build(":p1:compileLinuxMainKotlinMetadata") { assertSuccessful()
assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/linuxMain/klib/p1_linuxMain.klib")
assertFileExists("p1/build/classes/kotlin/metadata/linuxMain/klib/p1_linuxMain.klib") assertNoDuplicateLibraryWarning()
assertNoDuplicateLibraryWarning()
}
} }
if (Os.canCompileWindows) { build(":p1:compileMingwMainKotlinMetadata") {
build(":p1:compileMingwMainKotlinMetadata") { assertSuccessful()
assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/mingwMain/klib/p1_mingwMain.klib")
assertFileExists("p1/build/classes/kotlin/metadata/mingwMain/klib/p1_mingwMain.klib")
}
} }
if (Os.canCompileApple || Os.canCompileLinux) { build(":p1:compileAppleAndLinuxMainKotlinMetadata") {
build(":p1:compileAppleAndLinuxMainKotlinMetadata") { assertSuccessful()
assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/appleAndLinuxMain/klib/p1_appleAndLinuxMain.klib")
assertFileExists("p1/build/classes/kotlin/metadata/appleAndLinuxMain/klib/p1_appleAndLinuxMain.klib") assertNoDuplicateLibraryWarning()
assertNoDuplicateLibraryWarning()
}
} }
if (Os.canCompileApple || Os.canCompileLinux || Os.canCompileWindows) { build(":p1:compileNativeMainKotlinMetadata") {
build(":p1:compileNativeMainKotlinMetadata") { assertSuccessful()
assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/nativeMain/klib/p1_nativeMain.klib")
assertFileExists("p1/build/classes/kotlin/metadata/nativeMain/klib/p1_nativeMain.klib") assertNoDuplicateLibraryWarning()
assertNoDuplicateLibraryWarning() }
}
build(":p1:compileConcurrentMainKotlinMetadata") { build(":p1:compileConcurrentMainKotlinMetadata") {
assertSuccessful() assertSuccessful()
assertFileExists("p1/build/classes/kotlin/metadata/concurrentMain/default") assertFileExists("p1/build/classes/kotlin/metadata/concurrentMain/default")
assertNoDuplicateLibraryWarning() assertNoDuplicateLibraryWarning()
}
} }
} }
} }
@@ -72,7 +64,7 @@ open class CommonizerHierarchicalIT : BaseGradleIT() {
@Test @Test
fun `test commonizeHierarchically Klibrary compilations`() { fun `test commonizeHierarchically Klibrary compilations`() {
with(Project("commonizeHierarchically")) { with(Project("commonizeHierarchically")) {
if (Os.canCompileApple) { if (HostManager.hostIsMac) {
build(":p1:iosArm64MainKlibrary", ":p1:iosX64MainKlibrary", ":p1:macosX64MainKlibrary", ":p1:macosArm64MainKLibrary") { build(":p1:iosArm64MainKlibrary", ":p1:iosX64MainKlibrary", ":p1:macosX64MainKlibrary", ":p1:macosArm64MainKLibrary") {
assertSuccessful() assertSuccessful()
assertFileExists("p1/build/classes/kotlin/iosArm64/main/klib/p1.klib") assertFileExists("p1/build/classes/kotlin/iosArm64/main/klib/p1.klib")
@@ -83,22 +75,18 @@ open class CommonizerHierarchicalIT : BaseGradleIT() {
} }
} }
if (Os.canCompileLinux) { build(":p1:linuxX64MainKlibrary", ":p1:linuxArm64MainKlibrary") {
build(":p1:linuxX64MainKlibrary", ":p1:linuxArm64MainKlibrary") { assertSuccessful()
assertSuccessful() assertFileExists("p1/build/classes/kotlin/linuxX64/main/klib/p1.klib")
assertFileExists("p1/build/classes/kotlin/linuxX64/main/klib/p1.klib") assertFileExists("p1/build/classes/kotlin/linuxArm64/main/klib/p1.klib")
assertFileExists("p1/build/classes/kotlin/linuxArm64/main/klib/p1.klib") assertNoDuplicateLibraryWarning()
assertNoDuplicateLibraryWarning()
}
} }
if (Os.canCompileWindows) { build(":p1:mingwX64MainKlibrary", ":p1:mingwX86MainKlibrary") {
build(":p1:mingwX64MainKlibrary", ":p1:mingwX86MainKlibrary") { assertSuccessful()
assertSuccessful() assertFileExists("p1/build/classes/kotlin/mingwX64/main/klib/p1.klib")
assertFileExists("p1/build/classes/kotlin/mingwX64/main/klib/p1.klib") assertFileExists("p1/build/classes/kotlin/mingwX86/main/klib/p1.klib")
assertFileExists("p1/build/classes/kotlin/mingwX86/main/klib/p1.klib") assertNoDuplicateLibraryWarning()
assertNoDuplicateLibraryWarning()
}
} }
} }
} }
@@ -169,12 +157,5 @@ open class CommonizerHierarchicalIT : BaseGradleIT() {
} }
} }
private object Os {
private val os = OperatingSystem.current()
val canCompileApple get() = os.isMacOsX
val canCompileLinux get() = os.isLinux || os.isMacOsX
val canCompileWindows get() = os.isWindows || os.isMacOsX
}
private fun CompiledProject.assertNoDuplicateLibraryWarning() = assertNotContains("library included more than once") private fun CompiledProject.assertNoDuplicateLibraryWarning() = assertNotContains("library included more than once")
} }