From ae15fa7676d1a87081706aa8e5f86d1e79ad6de7 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Thu, 12 Dec 2019 11:27:45 +0300
Subject: [PATCH] [FIR] Fix outputs for logs of modularized test

---
 .../tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt | 4 ++--
 .../kotlin/fir/FirResolveModularizedTotalKotlinTest.kt        | 4 ++--
 2 files changed, 4 insertions(+), 4 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 3527a73b04b..82e2250e1b2 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
@@ -43,13 +43,13 @@ private fun NodeList.toList(): List<Node> {
 
 private val Node.childNodesList get() = childNodes.toList()
 
-private val ROOT_PATH_PREFIX = System.getProperty("fir.bench.prefix", "/")
+val ROOT_PATH_PREFIX = System.getProperty("fir.bench.prefix", "/")
 
 abstract class AbstractModularizedTest : KtUsefulTestCase() {
     private val folderDateFormat = SimpleDateFormat("yyyy-MM-dd")
     private lateinit var startDate: Date
 
-    protected fun reportDir() = File(FIR_LOGS_PATH, folderDateFormat.format(startDate))
+    protected fun reportDir() = File(ROOT_PATH_PREFIX).resolve(FIR_LOGS_PATH).resolve(folderDateFormat.format(startDate))
         .also {
             it.mkdirs()
         }
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 302eaf67cf9..160d524b18d 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
@@ -67,7 +67,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
 
     private fun dumpFir(disambiguatedName: String, moduleData: ModuleData, firFiles: List<FirFile>) {
         if (!DUMP_FIR) return
-        val dumpRoot = File(FIR_DUMP_PATH).resolve(disambiguatedName)
+        val dumpRoot = File(ROOT_PATH_PREFIX, FIR_DUMP_PATH).resolve(disambiguatedName)
         firFiles.forEach {
             val directory = it.packageFqName.pathSegments().fold(dumpRoot) { file, name -> file.resolve(name.asString()) }
             directory.mkdirs()
@@ -121,7 +121,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
     }
 
     override fun beforePass() {
-        if (DUMP_FIR) dump = MultiModuleHtmlFirDump(File(FIR_HTML_DUMP_PATH))
+        if (DUMP_FIR) dump = MultiModuleHtmlFirDump(File(ROOT_PATH_PREFIX, FIR_HTML_DUMP_PATH))
     }
 
     override fun afterPass(pass: Int) {