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

fix tests for js

Browse Source
This commit is contained in:
Michael Nedzelsky
2015-11-23 14:49:48 +03:00
parent ac8dd1262c
commit a7636126a1
12 changed files with 30 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java
+5 -2
View File
@@ -123,7 +123,7 @@ public class MockLibraryUtil {
File outDir = new File(contentDir, "out");
File outputFile = new File(outDir, jarName + ".js");
File outputMetaFile = new File(outDir, jarName + ".meta.js");
compileKotlin2JS(sourcesPath, outputFile, outputMetaFile);
compileKotlin2JS(sourcesPath, outputFile, outputMetaFile, true);
return createJarFile(contentDir, outDir, sourcesPath, jarName, addSources);
}
@@ -186,11 +186,14 @@ public class MockLibraryUtil {
runJvmCompiler(args);
}
public static void compileKotlin2JS(@NotNull String sourcesPath, @NotNull File outputFile, @Nullable File metaFile) {
public static void compileKotlin2JS(@NotNull String sourcesPath, @NotNull File outputFile, @Nullable File metaFile, boolean kjsm) {
List<String> args = new ArrayList<String>();
if (metaFile != null) {
args.add("-meta-info");
}
if (kjsm) {
args.add("-kjsm");
}
args.add("-output");
args.add(outputFile.getAbsolutePath());