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

Fixed JS test runner: save only stdlib module from run to run.

Browse Source
This commit is contained in:
Zalim Bashorov
2014-10-02 13:26:43 +04:00
parent 25172d797e
commit 9ac193407b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java
+8 -3
View File
@@ -164,12 +164,17 @@ public final class RhinoUtils {
versionToScope.put(version, parentScope); versionToScope.put(version, parentScope);
} }
else { else {
// reset declared modules
NativeObject kotlin = (NativeObject) parentScope.get("Kotlin"); NativeObject kotlin = (NativeObject) parentScope.get("Kotlin");
assert kotlin != null;
NativeObject modules = (NativeObject) kotlin.get("modules"); NativeObject modules = (NativeObject) kotlin.get("modules");
assert modules != null;
String stdlibModuleName = "kotlin_lib_compiled";
NativeObject stdlibModule = (NativeObject) modules.get(stdlibModuleName);
modules.setAttributes("JS_TESTS", 0); NativeObject newModules = new NativeObject();
modules.remove("JS_TESTS"); newModules.put(stdlibModuleName, newModules, stdlibModule);
kotlin.put("modules", kotlin, newModules);
} }
return parentScope; return parentScope;
} }