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

[JS SCRIPT] Fix test dependencies

Browse Source 
- make sure kotlin stdlib is compiled and accessible
This commit is contained in:
Roman Artemev
2020-05-14 14:44:49 +03:00
committed by romanart
parent 0e21dd15ba
commit 9d9930f748
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/js-test/build.gradle.kts
+2
View File
@@ -33,5 +33,7 @@ sourceSets {
} }
projectTest(parallel = true) { 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 workingDir = rootDir
} }
libraries/scripting/js-test/test/org/jetbrains/kotlin/scripting/repl/js/test/AbstractJsReplTest.kt
+2 -1
View File
@@ -63,9 +63,10 @@ abstract class AbstractJsReplTest : Closeable {
configuration.add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar()) configuration.add(ComponentRegistrar.PLUGIN_COMPONENT_REGISTRARS, ScriptingCompilerConfigurationComponentRegistrar())
configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, collector) configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, collector)
configuration.put(CommonConfigurationKeys.MODULE_NAME, "repl.kts") configuration.put(CommonConfigurationKeys.MODULE_NAME, "repl.kts")
val stdlibPath = System.getProperty("kotlin.js.full.stdlib.path")
val scriptConfiguration = ScriptCompilationConfiguration { val scriptConfiguration = ScriptCompilationConfiguration {
baseClass("kotlin.Any") baseClass("kotlin.Any")
dependencies.append(JsDependency("libraries/stdlib/js-ir/build/classes/kotlin/js/main/")) dependencies.append(JsDependency(stdlibPath))
platform.put("JS") platform.put("JS")
} }
configuration.add( configuration.add(