From 83ded9badf7fbc11baab36ad021326f6ee9e331e Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 17 Aug 2020 13:15:33 +0300 Subject: [PATCH] [FIR] Add pass argument to beforePass of modularized test --- .../tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt | 4 ++-- .../kotlin/fir/FirResolveModularizedTotalKotlinTest.kt | 2 +- .../org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt | 2 +- .../kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt index 805071420a9..0d7368ea531 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt @@ -132,13 +132,13 @@ abstract class AbstractModularizedTest : KtUsefulTestCase() { } - protected abstract fun beforePass() + protected abstract fun beforePass(pass: Int) protected abstract fun afterPass(pass: Int) protected open fun afterAllPasses() {} protected abstract fun processModule(moduleData: ModuleData): ProcessorAction protected fun runTestOnce(pass: Int) { - beforePass() + beforePass(pass) val testDataPath = System.getProperty("fir.bench.jps.dir")?.toString() ?: "/Users/jetbrains/jps" val root = File(testDataPath) diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt index e23ed8f430f..cb573d73109 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt @@ -143,7 +143,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() { return ProcessorAction.NEXT } - override fun beforePass() { + override fun beforePass(pass: Int) { if (DUMP_FIR) dump = MultiModuleHtmlFirDump(File(FIR_HTML_DUMP_PATH)) System.gc() } diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt index 41c53a32b2d..f52c63be13b 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FullPipelineModularizedTest.kt @@ -19,7 +19,7 @@ import java.io.PrintStream import java.nio.file.Files class FullPipelineModularizedTest : AbstractModularizedTest() { - override fun beforePass() { + override fun beforePass(pass: Int) { totalPassResult = CumulativeTime() totalModules = 0 okModules = 0 diff --git a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt index 2b01403a62c..2109f162a4e 100644 --- a/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt +++ b/compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/NonFirResolveModularizedTotalKotlinTest.kt @@ -106,7 +106,7 @@ class NonFirResolveModularizedTotalKotlinTest : AbstractModularizedTest() { override fun afterPass(pass: Int) {} - override fun beforePass() {} + override fun beforePass(pass: Int) {} fun testTotalKotlin() { writeMessageToLog("use_ni: $USE_NI")