From 5c0110850db487651e2c8c3b4a4ee83c08902c48 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 24 Mar 2017 04:56:14 +0300 Subject: [PATCH] Preprocess and build JS library tests --- libraries/stdlib/js/build.gradle | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/libraries/stdlib/js/build.gradle b/libraries/stdlib/js/build.gradle index 07301dce817..2ddaff96407 100644 --- a/libraries/stdlib/js/build.gradle +++ b/libraries/stdlib/js/build.gradle @@ -3,8 +3,11 @@ description = 'Kotlin Standard Library for JS' apply plugin: 'kotlin2js' ext.commonSrcDir = "${buildDir}/common-sources" +ext.commonTestSrcDir = "${buildDir}/common-test-sources" ext.builtinsDir = "${rootDir}/../core/builtins" -ext.jsSrcDir = "${rootDir}/../js/js.libraries/src" +ext.jsLibrariesDir = "${rootDir}/../js/js.libraries" +ext.jsSrcDir = "${jsLibrariesDir}/src" +ext.jsTestSrcDir = "${jsLibrariesDir}/test" ext.jsSrcJsDir = "${jsSrcDir}/js" ext.jsOutputFile = "${buildDir}/classes/kotlin.js" @@ -58,9 +61,21 @@ sourceSets { srcDir commonSrcDir } } + + test { + kotlin { + srcDir commonTestSrcDir + srcDir jsTestSrcDir + } + } +} + +dependencies { + testCompile project(':kotlin-test:kotlin-test-js') } createPreprocessorTask(project, "Main", "${projectDir}/../src/kotlin", commonSrcDir) +createPreprocessorTask(project, "Test", "${projectDir}/../test", commonTestSrcDir) kotlin.experimental.coroutines "enable" @@ -89,6 +104,13 @@ compileKotlin2Js { } } +compileTestKotlin2Js { + dependsOn preprocessSourcesTest + kotlinOptions { + moduleKind = "plain" + } +} + configurations { closureCompiler }