From 5e1efead9ae84d2c944ce5dff808fa7e3c7580f8 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Wed, 9 Oct 2019 13:39:13 +0200 Subject: [PATCH] Fixed errors reporting in tearDown in performance tests --- .../org/jetbrains/kotlin/idea/perf/Stats.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/Stats.kt b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/Stats.kt index 443572398de..06eb47bc001 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/Stats.kt +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/Stats.kt @@ -219,7 +219,7 @@ class Stats( printWarmUpTimings(phaseData.testName, warmUpStatInfosArray) } - warmUpStatInfosArray.filterNotNull().map { it[ERROR_KEY] as? Exception }.firstOrNull()?.let { throw it } + warmUpStatInfosArray.filterNotNull().map { it[ERROR_KEY] as? Throwable }.firstOrNull()?.let { throw it } } private fun mainPhase(phaseData: PhaseData): Array = @@ -264,6 +264,10 @@ class Stats( phaseData.tearDown(testData) } logMessage { "tearDown took $tearDownMillis ms" } + } catch (t: Throwable) { + println("# error at ${phaseData.testName} #$attempt:") + t.printStackTrace() + valueMap[ERROR_KEY] = t } finally { PerformanceCounter.resetAllCounters() }