PerfTests gradle interceptor clean up

idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/HighlightWholeProjectPerformanceTest.kt

@@ -38,11 +38,7 @@ class HighlightWholeProjectPerformanceTest : UsefulTestCase() {
     fun testHighlightAllKtFilesInProject() {
         val emptyProfile = System.getProperty("emptyProfile", "false").toBoolean()
         val projectSpecs = projectSpecs()
-        for (projectSpec in projectSpecs) {
+        suite(suiteName = "allKtFilesInProject") {
-            val projectName = projectSpec.name
-            val projectPath = projectSpec.path
-
-            suite(suiteName = "$projectName project") {
             app {
                 warmUpProject()
 
@@ -50,6 +46,9 @@ class HighlightWholeProjectPerformanceTest : UsefulTestCase() {
                     warmup = 1
                     iterations = 3
                 }
+                for (projectSpec in projectSpecs) {
+                    val projectName = projectSpec.name
+                    val projectPath = projectSpec.path
 
                     try {
                         project(ExternalProject(projectPath, ProjectOpenAction.GRADLE_PROJECT), refresh = true) {
@@ -93,7 +92,6 @@ class HighlightWholeProjectPerformanceTest : UsefulTestCase() {
                         // nothing as it is already caught by perfTest
                     }
                 }
-
             }
         }
     }

idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/logging.kt

@@ -9,7 +9,7 @@ import java.io.PrintWriter
 import java.io.StringWriter
 
 inline fun gradleMessage(block: () -> String) {
-    //print("#gradle ${block()}")
+    print("#gradle ${block()}")
 }
 
 inline fun logMessage(message: () -> String) {

idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/GradleProcessOutputInterceptor.kt

@@ -24,8 +24,11 @@ interface GradleProcessOutputInterceptor {
         fun install(parentDisposable: Disposable) {
             val installedExtensions = EP.extensions
 
+            val actual = installedExtensions.firstIsInstanceOrNull<GradleProcessOutputInterceptor>()
+            if (actual is GradleProcessOutputInterceptorImpl) return
+
             assertNull(
-                installedExtensions.firstIsInstanceOrNull<GradleProcessOutputInterceptor>(),
+                actual,
                 "Another ${GradleProcessOutputInterceptor::class.java.simpleName} is already installed"
             )