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

Adjust CommonizerIT to MinGW cross-compilation

Browse Source
This commit is contained in:
Sergey Bogolepov
2021-08-24 16:23:46 +07:00
parent d726b00c33
commit e9e986dd61
1 changed files with 2 additions and 3 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
+2 -3
View File
@@ -34,7 +34,6 @@ class CommonizerIT : BaseGradleIT() {
build("commonize", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=false") { build("commonize", "-Pkotlin.mpp.enableNativeDistributionCommonizationCache=false") {
assertTasksExecuted(":commonizeNativeDistribution") assertTasksExecuted(":commonizeNativeDistribution")
assertContains(DISABLED_NATIVE_TARGETS_REPORTER_WARNING_PREFIX)
assertContains(commonizerOutput) assertContains(commonizerOutput)
assertSuccessful() assertSuccessful()
} }
@@ -429,14 +428,14 @@ class CommonizerIT : BaseGradleIT() {
getCommonizerDependencies("commonTest").assertEmpty() getCommonizerDependencies("commonTest").assertEmpty()
getCommonizerDependencies("nativeMain").onlyCInterops().apply { getCommonizerDependencies("nativeMain").onlyCInterops().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper".takeIf { isUnix }) assertDependencyFilesMatches(".*nativeHelper")
assertTargetOnAllDependencies( 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, MINGW_X86)
) )
} }
getCommonizerDependencies("nativeTest").onlyCInterops().apply { getCommonizerDependencies("nativeTest").onlyCInterops().apply {
assertDependencyFilesMatches(".*nativeHelper", ".*unixHelper".takeIf { isUnix }, ".*nativeTestHelper") assertDependencyFilesMatches(".*nativeHelper", ".*nativeTestHelper")
assertTargetOnAllDependencies( 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, MINGW_X86)
) )