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] AbstractCommonizationFromSourcesTest remove assertions on commonized leaf/platform libraries

Browse Source 
Those assertions are not necessary anymore, since the commonizer is not
expected to produce any new "actuals" per given expect.
The IDE is supposed to analyze leaf source sets against the original
platform libraries.
This commit is contained in:
sebastian.sellmair
2021-06-14 14:11:52 +02:00
committed by Space
parent 42f60d981f
commit 21cef41ba5
67 changed files with 93 additions and 3679 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
native/commonizer-api/src/org/jetbrains/kotlin/commonizer/CliCommonizer.kt
View File

@@ -16,8 +16,7 @@ public fun CliCommonizer(classLoader: ClassLoader): CliCommonizer {
return CliCommonizer(CommonizerClassLoaderExecutor(classLoader))
}
public class CliCommonizer(private val executor: Executor) : Commonizer {
public class CliCommonizer(private val executor: Executor) : NativeDistributionCommonizer, CInteropCommonizer {
public fun interface Executor {
public operator fun invoke(arguments: List<String>)
}

7
native/commonizer-api/src/org/jetbrains/kotlin/commonizer/Commonizer.kt
View File

@@ -8,8 +8,7 @@ package org.jetbrains.kotlin.commonizer
import java.io.File
import java.io.Serializable
public interface Commonizer : Serializable {
public interface CInteropCommonizer : Serializable {
@Throws(Throwable::class)
public fun commonizeLibraries(
konanHome: File,
@@ -19,7 +18,9 @@ public interface Commonizer : Serializable {
outputDirectory: File,
logLevel: CommonizerLogLevel = CommonizerLogLevel.Quiet
)
}
public interface NativeDistributionCommonizer : Serializable {
@Throws(Throwable::class)
public fun commonizeNativeDistribution(
konanHome: File,
@@ -27,4 +28,4 @@ public interface Commonizer : Serializable {
outputTargets: Set<SharedCommonizerTarget>,
logLevel: CommonizerLogLevel = CommonizerLogLevel.Quiet
)
}
}

2
native/commonizer-api/src/org/jetbrains/kotlin/commonizer/TargetLibrariesLayout.kt
View File

@@ -12,7 +12,7 @@ import java.util.*
public object CommonizerOutputFileLayout {
internal const val maxFileNameLength = 150
public fun getCommonizedDirectory(root: File, target: CommonizerTarget): File {
public fun resolveCommonizedDirectory(root: File, target: CommonizerTarget): File {
return root.resolve(target.fileName)
}

18
native/commonizer-api/test/org/jetbrains/kotlin/commonizer/CommonizeNativeDistributionTest.kt
View File

@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.commonizer
import org.jetbrains.kotlin.commonizer.CommonizerOutputFileLayout.getCommonizedDirectory
import org.jetbrains.kotlin.commonizer.CommonizerOutputFileLayout.resolveCommonizedDirectory
import org.jetbrains.kotlin.commonizer.utils.konanHome
import org.jetbrains.kotlin.konan.target.KonanTarget.*
import org.junit.Rule
@@ -20,7 +20,7 @@ class CommonizeNativeDistributionTest {
val temporaryOutputDirectory = TemporaryFolder()
@Test
fun commonizeLinuxPlatforms() {
fun `commonize - linux platforms`() {
val linuxTarget1 = CommonizerTarget(LINUX_X64, LINUX_ARM64)
val linuxTarget2 = CommonizerTarget(LINUX_X64, LINUX_ARM64, LINUX_ARM32_HFP)
@@ -32,13 +32,23 @@ class CommonizeNativeDistributionTest {
)
assertTrue(
getCommonizedDirectory(temporaryOutputDirectory.root, linuxTarget1).isDirectory,
resolveCommonizedDirectory(temporaryOutputDirectory.root, linuxTarget1).isDirectory,
"Expected directory for $linuxTarget1"
)
assertTrue(
getCommonizedDirectory(temporaryOutputDirectory.root, linuxTarget2).isDirectory,
resolveCommonizedDirectory(temporaryOutputDirectory.root, linuxTarget2).isDirectory,
"Expected directory for $linuxTarget2"
)
}
@Test
fun `commonize - no outputTargets specified`() {
CliCommonizer(this::class.java.classLoader).commonizeNativeDistribution(
konanHome = konanHome,
outputTargets = emptySet(),
outputDirectory = temporaryOutputDirectory.root,
logLevel = CommonizerLogLevel.Info
)
}
}