From 5a6c04357bd052d052b931cc0458b32cb6d40ab2 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Fri, 6 Nov 2015 22:33:52 +0300
Subject: [PATCH] Add the ability to have separate log file for experimental
 incremental compilation tests

---
 .../jps/build/AbstractIncrementalJpsTest.kt      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index fb378feb85f..5e2cbda7856 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -46,8 +46,8 @@ import org.jetbrains.jps.util.JpsPathUtil
 import org.jetbrains.kotlin.config.IncrementalCompilation
 import org.jetbrains.kotlin.incremental.components.LookupTracker
 import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories
-import org.jetbrains.kotlin.jps.incremental.LookupStorageProvider
 import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
+import org.jetbrains.kotlin.jps.incremental.LookupStorageProvider
 import org.jetbrains.kotlin.jps.incremental.LookupSymbol
 import org.jetbrains.kotlin.jps.incremental.getKotlinCache
 import org.jetbrains.kotlin.test.KotlinTestUtils
@@ -323,7 +323,19 @@ public abstract class AbstractIncrementalJpsTest(
         val otherMakeResults = performModificationsAndMake(moduleNames)
 
         val buildLogFile = File(testDataDir, "build.log")
-        if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) {
+        val fullBuildLogFile = File(testDataDir, "experimental-ic-build.log")
+
+        if (enableExperimentalIncrementalCompilation && fullBuildLogFile.exists()) {
+            val logs = buildString {
+                otherMakeResults.forEachIndexed { i, makeResult ->
+                    append("\n========== Step #${i + 1} ============\n\n")
+                    append(makeResult.log)
+                }
+            }
+
+            UsefulTestCase.assertSameLinesWithFile(fullBuildLogFile.absolutePath, logs)
+        }
+        else if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) {
             val logs = otherMakeResults.joinToString("\n\n") { it.log }
             UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs)
         }