azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Fix outputs for logs of modularized test

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-12-12 11:27:45 +03:00
parent bb301f8aca
commit ae15fa7676
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/AbstractModularizedTest.kt
+2 -2
View File
@@ -43,13 +43,13 @@ private fun NodeList.toList(): List<Node> {
private val Node.childNodesList get() = childNodes.toList() 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() { abstract class AbstractModularizedTest : KtUsefulTestCase() {
private val folderDateFormat = SimpleDateFormat("yyyy-MM-dd") private val folderDateFormat = SimpleDateFormat("yyyy-MM-dd")
private lateinit var startDate: Date 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 { .also {
it.mkdirs() it.mkdirs()
} }
compiler/fir/modularized-tests/tests/org/jetbrains/kotlin/fir/FirResolveModularizedTotalKotlinTest.kt
+2 -2
View File
@@ -67,7 +67,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
private fun dumpFir(disambiguatedName: String, moduleData: ModuleData, firFiles: List<FirFile>) { private fun dumpFir(disambiguatedName: String, moduleData: ModuleData, firFiles: List<FirFile>) {
if (!DUMP_FIR) return 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 { firFiles.forEach {
val directory = it.packageFqName.pathSegments().fold(dumpRoot) { file, name -> file.resolve(name.asString()) } val directory = it.packageFqName.pathSegments().fold(dumpRoot) { file, name -> file.resolve(name.asString()) }
directory.mkdirs() directory.mkdirs()
@@ -121,7 +121,7 @@ class FirResolveModularizedTotalKotlinTest : AbstractModularizedTest() {
} }
override fun beforePass() { 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) { override fun afterPass(pass: Int) {