From e6af8e20a5bcf4bd645ae60ae6517e4e945c5d1f Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Thu, 19 Nov 2015 02:19:57 +0300
Subject: [PATCH] fix KT-10064 Regression: Error with multiple main functions
 within a single package

#KT-10064 Fixed

Original commit: aa8f3df9a8f37d4621aaa38b82e93a3e631d4853
---
 .../jps/build/ExperimentalIncrementalJpsTestGenerated.java | 6 ++++++
 .../kotlin/jps/build/IncrementalJpsTestGenerated.java      | 6 ++++++
 .../testData/incremental/pureKotlin/mainRedeclaration/a.kt | 3 +++
 .../incremental/pureKotlin/mainRedeclaration/a.kt.new      | 3 +++
 .../testData/incremental/pureKotlin/mainRedeclaration/b.kt | 3 +++
 .../incremental/pureKotlin/mainRedeclaration/build.log     | 7 +++++++
 6 files changed, 28 insertions(+)
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt
 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log

diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
index 32bd506fd4d..828ea743a87 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java
@@ -395,6 +395,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
             doTest(fileName);
         }
 
+        @TestMetadata("mainRedeclaration")
+        public void testMainRedeclaration() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/");
+            doTest(fileName);
+        }
+
         @TestMetadata("moveClass")
         public void testMoveClass() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/");
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
index 63fd8b14dab..c9c192a8b94 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
@@ -395,6 +395,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("mainRedeclaration")
+        public void testMainRedeclaration() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/");
+            doTest(fileName);
+        }
+
         @TestMetadata("moveClass")
         public void testMoveClass() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/");
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt
new file mode 100644
index 00000000000..8eb2fb2be08
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt
@@ -0,0 +1,3 @@
+package foo
+
+fun main(args: Array<String>) = println("a")
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new
new file mode 100644
index 00000000000..4feab3ef68d
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new
@@ -0,0 +1,3 @@
+package foo
+
+fun main(args: Array<String>) = println("A")
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt
new file mode 100644
index 00000000000..7d4e748601c
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt
@@ -0,0 +1,3 @@
+package foo
+
+fun main(args: Array<String>) = println("b")
\ No newline at end of file
diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log
new file mode 100644
index 00000000000..9ecb2e772f7
--- /dev/null
+++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log
@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/foo/AKt.class
+End of files
+Compiling files:
+src/a.kt
+End of files
\ No newline at end of file