From 9f2feb1d27afc2e62353fa3c5c769026ef36c9e7 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 6 Aug 2015 16:07:10 +0300
Subject: [PATCH] Set failOnError = true by default in kotlinc Ant task as in
 javac

 #KT-8742 Fixed
---
 .../kotlin/ant/KotlinCompilerBaseTask.kt      |  2 +-
 .../failOnErrorByDefault/build.log.expected   | 20 +++++++++++++++++++
 .../ant/jvm/failOnErrorByDefault/build.xml    |  7 +++++++
 .../incorrectKotlinCode.kt                    |  1 +
 .../integration/AntTaskTestGenerated.java     |  6 ++++++
 5 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.log.expected
 create mode 100644 compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.xml
 create mode 100644 compiler/testData/integration/ant/jvm/failOnErrorByDefault/incorrectKotlinCode.kt

diff --git a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
index 5c86f2481aa..0197d962892 100644
--- a/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
+++ b/ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt
@@ -34,7 +34,7 @@ public abstract class KotlinCompilerBaseTask : Task() {
     public var nowarn: Boolean = false
     public var verbose: Boolean = false
     public var printVersion: Boolean = false
-    public var failOnError: Boolean = false
+    public var failOnError: Boolean = true
 
     public var noStdlib: Boolean = false
 
diff --git a/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.log.expected b/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.log.expected
new file mode 100644
index 00000000000..2c927cbab2a
--- /dev/null
+++ b/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.log.expected
@@ -0,0 +1,20 @@
+OUT:
+Buildfile: [TestData]/build.xml
+
+build:
+  [kotlinc] Compiling [[TestData]] => [[Temp]]
+  [kotlinc] [TestData]/incorrectKotlinCode.kt:1:5: error: expecting a top level declaration
+  [kotlinc] xxxx
+  [kotlinc]     ^
+  [kotlinc] [TestData]/incorrectKotlinCode.kt:1:1: error: unresolved reference: xxxx
+  [kotlinc] xxxx
+  [kotlinc] ^
+
+ERR:
+
+BUILD FAILED
+[TestData]/build.xml:5: Compile failed; see the compiler error output for details.
+
+Total time: [time]
+
+Return code: 1
diff --git a/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.xml b/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.xml
new file mode 100644
index 00000000000..dbdd88c71d3
--- /dev/null
+++ b/compiler/testData/integration/ant/jvm/failOnErrorByDefault/build.xml
@@ -0,0 +1,7 @@
+<project name="Ant Task Test" default="build">
+    <taskdef resource="org/jetbrains/kotlin/ant/antlib.xml" classpath="${kotlin.lib}/kotlin-ant.jar"/>
+
+    <target name="build">
+        <kotlinc src="${test.data}" output="${temp}"/>
+    </target>
+</project>
diff --git a/compiler/testData/integration/ant/jvm/failOnErrorByDefault/incorrectKotlinCode.kt b/compiler/testData/integration/ant/jvm/failOnErrorByDefault/incorrectKotlinCode.kt
new file mode 100644
index 00000000000..63fc8131d56
--- /dev/null
+++ b/compiler/testData/integration/ant/jvm/failOnErrorByDefault/incorrectKotlinCode.kt
@@ -0,0 +1 @@
+xxxx
diff --git a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java
index f000c6b7f7f..767b993702c 100644
--- a/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/integration/AntTaskTestGenerated.java
@@ -47,6 +47,12 @@ public class AntTaskTestGenerated extends AbstractAntTaskTest {
         doTest(fileName);
     }
 
+    @TestMetadata("failOnErrorByDefault")
+    public void testFailOnErrorByDefault() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/failOnErrorByDefault/");
+        doTest(fileName);
+    }
+
     @TestMetadata("helloWorld")
     public void testHelloWorld() throws Exception {
         String fileName = JetTestUtils.navigationMetadata("compiler/testData/integration/ant/jvm/helloWorld/");