Extending daemon diagnostics reporting in tests

compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt

@@ -39,11 +39,17 @@ public class CompilerDaemonTest : KotlinIntegrationTestBase() {
                                                         File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar")) }
 
     private fun compileOnDaemon(args: Array<out String>): CompilerResults {
-        val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(out = System.err), autostart = true, checkId = true)
+        System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "")
-        TestCase.assertNotNull("failed to connect daemon", daemon)
+        try {
-        val strm = ByteArrayOutputStream()
+            val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(out = System.err), autostart = true, checkId = true)
-        val code = KotlinCompilerClient.compile(daemon!!, args, strm)
+            TestCase.assertNotNull("failed to connect daemon", daemon)
-        return CompilerResults(code, strm.toString())
+            val strm = ByteArrayOutputStream()
+            val code = KotlinCompilerClient.compile(daemon!!, args, strm)
+            return CompilerResults(code, strm.toString())
+        }
+        finally {
+            System.clearProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY)
+        }
     }
 
     private fun runDaemonCompilerTwice(logName: String, vararg arguments: String): Unit {

jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt

@@ -20,6 +20,7 @@ import com.intellij.util.PathUtil
 import org.jetbrains.jps.model.java.JpsJavaExtensionService
 import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY
 import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY
+import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY
 import org.jetbrains.kotlin.test.JetTestUtils
 import java.io.File
 
@@ -110,6 +111,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
 
     public fun testThreeModulesNoReexportWithDaemon() {
         System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"")
+        System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "")
         val flagFile = File.createTempFile("kotlin-jps-tests-", "-is-running");
         try {
             System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath)
@@ -118,6 +120,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
         finally {
             flagFile.delete()
             System.clearProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY)
+            System.clearProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY)
             System.clearProperty(COMPILE_DAEMON_ENABLED_PROPERTY)
         }
     }