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

made the test case fail if there is a compile error - and temporarily commented out a few JS library files that don't compile yet

Browse Source
This commit is contained in:
James Strachan
2012-06-01 07:44:38 +01:00
parent f18372cfdc
commit d450acf99c
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java
+3 -1
View File
@@ -18,6 +18,7 @@ package org.jetbrains.k2js.test.semantics;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.cli.common.ExitCode;
import org.jetbrains.jet.cli.js.K2JSCompiler; import org.jetbrains.jet.cli.js.K2JSCompiler;
import org.jetbrains.jet.cli.js.K2JSCompilerArguments; import org.jetbrains.jet.cli.js.K2JSCompilerArguments;
import org.jetbrains.k2js.config.Config; import org.jetbrains.k2js.config.Config;
@@ -71,7 +72,8 @@ public final class StdLibToJSTest extends SingleFileTranslationTest {
arguments.outputFile = getOutputFilePath(getTestName(false) + ".compiler.kt", version); arguments.outputFile = getOutputFilePath(getTestName(false) + ".compiler.kt", version);
arguments.sourceFiles = files; arguments.sourceFiles = files;
arguments.verbose = true; arguments.verbose = true;
compiler.exec(System.out, arguments); ExitCode answer = compiler.exec(System.out, arguments);
assertEquals("Compile failed", ExitCode.OK, answer);
} }
} }
} }
js/js.translator/src/org/jetbrains/k2js/config/Config.java
+6 -5
View File
@@ -64,11 +64,12 @@ public abstract class Config {
"/raphael/raphael.kt", "/raphael/raphael.kt",
"/stdlib/JUMaps.kt", "/stdlib/JUMaps.kt",
"/stdlib/browser.kt", "/stdlib/browser.kt",
"/core/dom.kt", "/core/dom.kt"
"/dom/domcore.kt", // TODO doesn't compile yet
"/dom/html/htmlcore.kt", // "/dom/domcore.kt",
"/dom/html/window.kt", // "/dom/html/htmlcore.kt",
"/dom/html5/canvas.kt" //"/dom/html5/canvas.kt"
//"/dom/html/window.kt"
); );
public static final String LIBRARIES_LOCATION = "js/js.libraries/src"; public static final String LIBRARIES_LOCATION = "js/js.libraries/src";