jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Commonizer] CommonizeLibcurlTest: Add commonizeSuccessfully with unsupported targets

Browse Source 
This test will assert behaviour on 'unsupported' targets requested from the commonizer

^KT-46077
This commit is contained in:
sebastian.sellmair
2021-04-14 14:11:03 +02:00
committed by Space
parent bbcfde7231
commit f893709e5b
2 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
native/commonizer-api/src/org/jetbrains/kotlin/commonizer/CommonizerTarget.kt
View File

@@ -56,6 +56,14 @@ public fun CommonizerTarget(konanTarget: KonanTarget, vararg konanTargets: Konan
return SharedCommonizerTarget(targets.map(::LeafCommonizerTarget).toSet())
}
public fun CommonizerTarget(commonizerTarget: CommonizerTarget, vararg commonizerTargets: CommonizerTarget): SharedCommonizerTarget {
val targets = mutableListOf<CommonizerTarget>().apply {
add(commonizerTarget)
addAll(commonizerTargets)
}
return SharedCommonizerTarget(targets.toSet())
}
public val CommonizerTarget.identityString: String
get() = when (this) {
is LeafCommonizerTarget -> name

60
native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizeLibcurlTest.kt
View File

@@ -6,8 +6,7 @@
package org.jetbrains.kotlin.commonizer
import org.jetbrains.kotlin.commonizer.utils.konanHome
import org.jetbrains.kotlin.konan.target.KonanTarget.LINUX_ARM64
import org.jetbrains.kotlin.konan.target.KonanTarget.LINUX_X64
import org.jetbrains.kotlin.konan.target.KonanTarget.*
import org.junit.Rule
import org.junit.rules.TemporaryFolder
import java.io.File
@@ -69,15 +68,6 @@ class CommonizeLibcurlTest {
assertContainsKnmFiles(arm64OutputDirectory)
assertContainsKnmFiles(commonOutputDirectory)
fun assertContainsManifestWithContent(directory: File, content: String) {
val manifest = directory.walkTopDown().firstOrNull { it.name == "manifest" }
?: fail("${directory.name} does not contain any manifest")
assertTrue(
content in manifest.readText(),
"Expected manifest in ${directory.name} to contain $content\n${manifest.readText()}"
)
}
assertContainsManifestWithContent(x64OutputDirectory, "native_targets=linux_x64")
assertContainsManifestWithContent(arm64OutputDirectory, "native_targets=linux_arm64")
@@ -91,4 +81,52 @@ class CommonizeLibcurlTest {
commonOutputDirectory, "commonizer_target=${CommonizerTarget(LINUX_X64, LINUX_ARM64).identityString}"
)
}
@Test
fun `commonizeSuccessfully with unsupported targets`() {
val libraries = File("testData/libcurl").walkTopDown().filter { it.isFile && it.extension == "klib" }.toSet()
val commonizer = CliCommonizer(this::class.java.classLoader)
commonizer.commonizeLibraries(
konanHome = konanHome,
inputLibraries = libraries,
dependencyLibraries = emptySet<CommonizerDependency>() +
KonanDistribution(konanHome).platformLibsDir.resolve(LINUX_X64.name).listFiles().orEmpty()
.map { TargetedCommonizerDependency(LeafCommonizerTarget(LINUX_X64), it) }.toSet() +
KonanDistribution(konanHome).platformLibsDir.resolve(LINUX_ARM64.name).listFiles().orEmpty()
.map { TargetedCommonizerDependency(LeafCommonizerTarget(LINUX_ARM64), it) }
.toSet(),
outputCommonizerTarget = CommonizerTarget(LINUX_ARM64, LINUX_X64, MACOS_X64),
outputDirectory = temporaryOutputDirectory.root
)
val x64OutputDirectory = temporaryOutputDirectory.root.resolve(CommonizerTarget(LINUX_X64).identityString)
val arm64OutputDirectory = temporaryOutputDirectory.root.resolve(CommonizerTarget(LINUX_ARM64).identityString)
val commonOutputDirectory = temporaryOutputDirectory.root
.resolve(CommonizerTarget(LINUX_X64, LINUX_ARM64, MACOS_X64).identityString)
assertContainsManifestWithContent(x64OutputDirectory, "native_targets=linux_x64")
assertContainsManifestWithContent(arm64OutputDirectory, "native_targets=linux_arm64")
assertContainsManifestWithContent(commonOutputDirectory, "native_targets=linux_arm64 linux_x64")
assertContainsManifestWithContent(x64OutputDirectory, "commonizer_target=linux_x64")
assertContainsManifestWithContent(arm64OutputDirectory, "commonizer_target=linux_arm64")
assertContainsManifestWithContent(commonOutputDirectory, "commonizer_native_targets=linux_arm64 linux_x64 macos_x64")
assertContainsManifestWithContent(
commonOutputDirectory, "commonizer_target=${CommonizerTarget(LINUX_X64, LINUX_ARM64, MACOS_X64).identityString}"
)
}
}
private fun assertContainsManifestWithContent(directory: File, content: String) {
val manifest = directory.walkTopDown().firstOrNull { it.name == "manifest" }
?: fail("${directory.name} does not contain any manifest")
assertTrue(
content in manifest.readText(),
"Expected manifest in ${directory.name} to contain $content\n${manifest.readText()}"
)
}