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

[Gradle, JS] Add testExecutable for subtargets

Browse Source
This commit is contained in:
Ilya Goncharov
2020-02-13 12:41:36 +03:00
parent 625e94822f
commit 9bff6a709f
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt
+11 -1
View File
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests import org.jetbrains.kotlin.gradle.plugin.KotlinTargetWithTests
import org.jetbrains.kotlin.gradle.plugin.whenEvaluated import org.jetbrains.kotlin.gradle.plugin.whenEvaluated
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlatformTestRun import org.jetbrains.kotlin.gradle.targets.js.KotlinJsPlatformTestRun
import org.jetbrains.kotlin.gradle.targets.js.dsl.BuildVariantKind
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmResolverPlugin import org.jetbrains.kotlin.gradle.targets.js.npm.NpmResolverPlugin
@@ -36,6 +37,8 @@ abstract class KotlinJsIrSubTarget(
private set private set
internal fun configure() { internal fun configure() {
target.binaries.testExecutable()
NpmResolverPlugin.apply(project) NpmResolverPlugin.apply(project)
configureBuildVariants() configureBuildVariants()
@@ -94,7 +97,14 @@ abstract class KotlinJsIrSubTarget(
testJs.group = LifecycleBasePlugin.VERIFICATION_GROUP testJs.group = LifecycleBasePlugin.VERIFICATION_GROUP
testJs.description = testTaskDescription testJs.description = testTaskDescription
testJs.inputFileProperty.set(compilation.developmentLinkTask.map { it.outputFileProperty.get() }) val testExecutableTask = target.binaries.getBinary(
BuildVariantKind.DEVELOPMENT,
JsBinaryType.TEST
).linkTask
testJs.inputFileProperty.set(
testExecutableTask.map { it.outputFileProperty.get() }
)
testJs.dependsOn(nodeJs.npmInstallTask, nodeJs.nodeJsSetupTask) testJs.dependsOn(nodeJs.npmInstallTask, nodeJs.nodeJsSetupTask)