From d450acf99c300c06580583bb32e611387e861597 Mon Sep 17 00:00:00 2001 From: James Strachan Date: Fri, 1 Jun 2012 07:44:38 +0100 Subject: [PATCH] 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 --- .../jetbrains/k2js/test/semantics/StdLibToJSTest.java | 4 +++- .../src/org/jetbrains/k2js/config/Config.java | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java index 50f6394eba8..42873c5478e 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java @@ -18,6 +18,7 @@ package org.jetbrains.k2js.test.semantics; import com.google.common.collect.Lists; 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.K2JSCompilerArguments; 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.sourceFiles = files; arguments.verbose = true; - compiler.exec(System.out, arguments); + ExitCode answer = compiler.exec(System.out, arguments); + assertEquals("Compile failed", ExitCode.OK, answer); } } } diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java index d09f3f89e2a..821deb82755 100644 --- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java +++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java @@ -64,11 +64,12 @@ public abstract class Config { "/raphael/raphael.kt", "/stdlib/JUMaps.kt", "/stdlib/browser.kt", - "/core/dom.kt", - "/dom/domcore.kt", - "/dom/html/htmlcore.kt", - "/dom/html/window.kt", - "/dom/html5/canvas.kt" + "/core/dom.kt" + // TODO doesn't compile yet + // "/dom/domcore.kt", + // "/dom/html/htmlcore.kt", + //"/dom/html5/canvas.kt" + //"/dom/html/window.kt" ); public static final String LIBRARIES_LOCATION = "js/js.libraries/src";