[tests] Fix task dependency for testObjCExport

This commit is contained in:
Ilya Matveev
2020-04-13 17:52:54 +07:00
committed by Ilya Matveev
parent b4787a1379
commit 5c6cb60ad3
2 changed files with 10 additions and 1 deletions
+8
View File
@@ -3961,6 +3961,10 @@ if (isAppleTarget(project)) {
srcDir "objcexport/library"
artifactName "test-library"
if (!useCustomDist) {
dependsOn ":${target.name}CrossDistRuntime", ':distCompiler'
}
extraOpts "-Xshort-module-name=MyLibrary"
extraOpts "-module-name", "org.jetbrains.kotlin.native.test-library"
}
@@ -4006,6 +4010,10 @@ if (isAppleTarget(project)) {
srcDir "objcexport/library"
artifactName "test-library"
if (!useCustomDist) {
dependsOn ":${target.name}CrossDistRuntime", ':distCompiler'
}
extraOpts "-Xshort-module-name=MyLibrary"
extraOpts "-module-name", "org.jetbrains.kotlin.native.test-library"
}
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.gradle.plugin.konan
import org.gradle.api.Named
import org.gradle.api.Project
import org.gradle.api.file.FileCollection
import org.jetbrains.kotlin.gradle.plugin.konan.KonanPlugin.ProjectProperty.KONAN_HOME
import org.jetbrains.kotlin.konan.target.Family
import org.jetbrains.kotlin.konan.target.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget
@@ -91,7 +92,7 @@ internal abstract class KonanCliRunner(
project.logger.info("Run tool: $toolName with args: ${args.joinToString(separator = " ")}")
if (classpath.isEmpty) {
throw IllegalStateException("Classpath of the tool is empty: $toolName\n" +
"Probably the '${KonanPlugin.ProjectProperty.KONAN_HOME}' project property contains an incorrect path.\n" +
"Probably the '${KONAN_HOME.propertyName}' project property contains an incorrect path.\n" +
"Please change it to the compiler root directory and rerun the build.")
}