diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java index c1ffd14788a..e950a75bbb1 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java @@ -210,7 +210,7 @@ public abstract class CLICompiler { @NotNull public static ExitCode doMainNoExit(@NotNull CLICompiler compiler, @NotNull String[] args) { try { - ExitCode rc = compiler.exec(System.out, args); + ExitCode rc = compiler.exec(System.err, args); if (rc != OK) { System.err.println("exec() finished with " + rc + " return code"); } diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java index 6b544d4500e..52f039ec650 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java @@ -69,4 +69,8 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase { runCompiler("test.compile", "-src", "test.kt", "-jar", jar); } + @Test + public void simpleScript() throws Exception { + runCompiler("script", "-script", "script.kts", "hi", "there"); + } } diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java index 94c7b10bbbf..b8b72abd269 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java @@ -62,13 +62,18 @@ public abstract class KotlinIntegrationTestBase { new File(getKotlinProjectHome(), "compiler" + File.separator + "integration-tests" + File.separator + "testData"); testDataDir = new File(baseTestDataDir, description.getMethodName()); } - }; + static { + System.setProperty("java.awt.headless", "true"); + } + protected int runCompiler(String logName, String... arguments) throws Exception { File lib = getCompilerLib(); - String classpath = lib.getAbsolutePath() + File.separator + "kotlin-compiler.jar"; + String classpath = lib.getAbsolutePath() + File.separator + + "kotlin-compiler.jar" + File.pathSeparator + + getKotlinRuntimePath(); Collection javaArgs = new ArrayList(); javaArgs.add("-cp"); diff --git a/compiler/integration-tests/testData/compilationFailed/hello.compile.expected b/compiler/integration-tests/testData/compilationFailed/hello.compile.expected index 3a2a7c38bc3..dbd5f4b53fd 100644 --- a/compiler/integration-tests/testData/compilationFailed/hello.compile.expected +++ b/compiler/integration-tests/testData/compilationFailed/hello.compile.expected @@ -1,7 +1,6 @@ -OUT: -ERROR: [TestData]/hello.kt: (4, 5) Unresolved reference: a ERR: +ERROR: [TestData]/hello.kt: (4, 5) Unresolved reference: a exec() finished with COMPILATION_ERROR return code Return code: 1 diff --git a/compiler/integration-tests/testData/simpleScript/script.expected b/compiler/integration-tests/testData/simpleScript/script.expected new file mode 100644 index 00000000000..039f13e43e8 --- /dev/null +++ b/compiler/integration-tests/testData/simpleScript/script.expected @@ -0,0 +1,5 @@ +OUT: +hi +there + +Return code: 0 diff --git a/compiler/testData/cli/jvm/script.kts b/compiler/integration-tests/testData/simpleScript/script.kts similarity index 100% rename from compiler/testData/cli/jvm/script.kts rename to compiler/integration-tests/testData/simpleScript/script.kts diff --git a/compiler/integration-tests/testData/syntaxErrors/test.compile.expected b/compiler/integration-tests/testData/syntaxErrors/test.compile.expected index eb371a9470c..59b60ce9323 100644 --- a/compiler/integration-tests/testData/syntaxErrors/test.compile.expected +++ b/compiler/integration-tests/testData/syntaxErrors/test.compile.expected @@ -1,7 +1,6 @@ -OUT: -ERROR: [TestData]/test.kt: (4, 20) Expecting an element ERR: +ERROR: [TestData]/test.kt: (4, 20) Expecting an element exec() finished with COMPILATION_ERROR return code Return code: 1 diff --git a/compiler/testData/cli/jvm/script.args b/compiler/testData/cli/jvm/script.args deleted file mode 100644 index 1f3bc38ff29..00000000000 --- a/compiler/testData/cli/jvm/script.args +++ /dev/null @@ -1,4 +0,0 @@ --script -$TESTDATA_DIR$/script.kts -hi -there \ No newline at end of file diff --git a/compiler/testData/cli/jvm/script.out b/compiler/testData/cli/jvm/script.out deleted file mode 100644 index c64071036cd..00000000000 --- a/compiler/testData/cli/jvm/script.out +++ /dev/null @@ -1,3 +0,0 @@ -hi -there -OK diff --git a/compiler/tests/org/jetbrains/jet/cli/AbstractKotlincExecutableTest.java b/compiler/tests/org/jetbrains/jet/cli/AbstractKotlincExecutableTest.java index 5fee33f50f3..f31694ec6e9 100644 --- a/compiler/tests/org/jetbrains/jet/cli/AbstractKotlincExecutableTest.java +++ b/compiler/tests/org/jetbrains/jet/cli/AbstractKotlincExecutableTest.java @@ -42,14 +42,14 @@ public abstract class AbstractKotlincExecutableTest extends TestCaseWithTmpdir { String stderr = processOutput.getStderr(); int exitCode = processOutput.getExitCode(); - String normalizedOutput = CliBaseTest.getNormalizedCompilerOutput(stdout, ExitCode.values()[exitCode], testDataDir); + String normalizedOutput = CliBaseTest.getNormalizedCompilerOutput(stderr, ExitCode.values()[exitCode], testDataDir); File outFile = new File(argsFilePath.replace(".args", ".out")); try { JetTestUtils.assertEqualsToFile(outFile, normalizedOutput); } catch (Exception e) { - System.err.println("exitcode " + exitCode); + System.err.println("exit code " + exitCode); System.err.println("" + stdout + ""); System.err.println("" + stderr + ""); diff --git a/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java index 7ce9545b84d..3ee4623678b 100644 --- a/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java @@ -48,9 +48,9 @@ public class CliBaseTest { @NotNull private static Pair executeCompilerGrabOutput(@NotNull CLICompiler compiler, @NotNull List args) { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - PrintStream origOut = System.out; + PrintStream origErr = System.err; try { - System.setOut(new PrintStream(bytes)); + System.setErr(new PrintStream(bytes)); ExitCode exitCode = CLICompiler.doMainNoExit(compiler, ArrayUtil.toStringArray(args)); return Pair.create(bytes.toString("utf-8"), exitCode); } @@ -58,7 +58,7 @@ public class CliBaseTest { throw UtilsPackage.rethrow(e); } finally { - System.setOut(origOut); + System.setErr(origErr); } } diff --git a/compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java b/compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java index 67e9897d06f..3b40111672f 100644 --- a/compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java +++ b/compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java @@ -16,9 +16,9 @@ package org.jetbrains.jet.cli; -import junit.framework.Assert; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.junit.Assert; import org.junit.Test; import java.io.File; @@ -34,16 +34,6 @@ public class CliCommonTest extends CliBaseTest { executeCompilerCompareOutputJVM(); } - @Test - public void printArguments() throws Exception { - executeCompilerCompareOutputJVM(); - } - - @Test - public void printArgumentsWithManyValue() throws Exception { - executeCompilerCompareOutputJS(); - } - @Test public void simple() throws Exception { executeCompilerCompareOutputJVM(); diff --git a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java index 8b37391d1c9..6e2d05507ec 100644 --- a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java @@ -79,11 +79,6 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes doJvmTest("compiler/testData/cli/jvm/printArguments.args"); } - @TestMetadata("script.args") - public void testScript() throws Exception { - doJvmTest("compiler/testData/cli/jvm/script.args"); - } - @TestMetadata("signatureClash.args") public void testSignatureClash() throws Exception { doJvmTest("compiler/testData/cli/jvm/signatureClash.args"); diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java index 58c46e50bb1..a6513623992 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java +++ b/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java @@ -16,10 +16,10 @@ package org.jetbrains.jet.cli.jvm; -import junit.framework.Assert; import org.jetbrains.jet.cli.CliBaseTest; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.junit.Assert; import org.junit.Test; import java.io.File; @@ -47,11 +47,6 @@ public class K2JvmCliTest extends CliBaseTest { executeCompilerCompareOutputJVM(); } - @Test - public void script() throws Exception { - executeCompilerCompareOutputJVM(); - } - @Test public void classpath() throws Exception { executeCompilerCompareOutputJVM();