From 9d9930f748ebf4fe5b6cffe4262c27d90adad200 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Thu, 14 May 2020 14:44:49 +0300 Subject: [PATCH] [JS SCRIPT] Fix test dependencies - make sure kotlin stdlib is compiled and accessible --- libraries/scripting/js-test/build.gradle.kts | 2 ++ .../kotlin/scripting/repl/js/test/AbstractJsReplTest.kt | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/scripting/js-test/build.gradle.kts b/libraries/scripting/js-test/build.gradle.kts index 49583a45fbd..9788cccf700 100644 --- a/libraries/scripting/js-test/build.gradle.kts +++ b/libraries/scripting/js-test/build.gradle.kts @@ -33,5 +33,7 @@ sourceSets { } projectTest(parallel = true) { + dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs") + systemProperty("kotlin.js.full.stdlib.path", "libraries/stdlib/js-ir/build/classes/kotlin/js/main") workingDir = rootDir } diff --git a/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/AbstractJsReplTest.kt b/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/AbstractJsReplTest.kt index 2453f2b0eee..6dfc7965700 100644 --- a/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/AbstractJsReplTest.kt +++ b/libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/AbstractJsReplTest.kt @@ -63,9 +63,10 @@ abstract class AbstractJsReplTest : Closeable { configuration.add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar()) configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, collector) configuration.put(CommonConfigurationKeys.MODULE_NAME, "repl.kts") + val stdlibPath = System.getProperty("kotlin.js.full.stdlib.path") val scriptConfiguration = ScriptCompilationConfiguration { baseClass("kotlin.Any") - dependencies.append(JsDependency("libraries/stdlib/js-ir/build/classes/kotlin/js/main/")) + dependencies.append(JsDependency(stdlibPath)) platform.put("JS") } configuration.add(