From 5a18a565b7778efbbda46edb520d3bea235e12c5 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Fri, 29 Jan 2021 14:07:19 +0700 Subject: [PATCH] Support interop libraries in dynamic tests --- kotlin-native/backend.native/tests/build.gradle | 9 +++++++++ .../main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt | 3 +++ 2 files changed, 12 insertions(+) diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle index 60ea4d33b1a..f3367aea24c 100644 --- a/kotlin-native/backend.native/tests/build.gradle +++ b/kotlin-native/backend.native/tests/build.gradle @@ -424,7 +424,16 @@ Task dynamicTest(String name, Closure configureClosure) { if (task.enabled) { konanArtifacts { def targetName = target.name + def lib = task.interop + if (lib != null) { + UtilsKt.dependsOnKonanBuildingTask(task, lib, target) + } dynamic(name, targets: [targetName]) { + if (lib != null) { + libraries { + artifact lib + } + } srcFiles task.getSources() baseDir "$testOutputLocal/$name" extraOpts task.flags diff --git a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt index 85fb358c380..5fa30e13660 100644 --- a/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt +++ b/kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt @@ -436,6 +436,9 @@ open class KonanDynamicTest : KonanStandaloneTest() { @Input var clangFlags: List = listOf() + @Input @Optional + var interop: String? = null + // Replace testlib_api.h and all occurrences of the testlib with the actual name of the test private fun processCSource(): String { val sourceFile = File(cSource)