diff --git a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt index b8ae57d2b9c..d8fc8aa5b6a 100644 --- a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt +++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt @@ -18,11 +18,13 @@ package org.jetbrains.kotlin.incremental.testingUtils import java.io.File -class BuildLogFinder( +data class BuildLogFinder( private val isDataContainerBuildLogEnabled: Boolean = false, - private val isGradleEnabled: Boolean = false + private val isGradleEnabled: Boolean = false, + private val isJsEnabled: Boolean = false ) { companion object { + private const val JS_LOG = "js-build.log" private const val GRADLE_LOG = "gradle-build.log" private const val DATA_CONTAINER_LOG = "data-container-version-build.log" private const val SIMPLE_LOG = "build.log" @@ -32,6 +34,7 @@ class BuildLogFinder( val names = dir.list() ?: arrayOf() val files = names.filter { File(dir, it).isFile }.toSet() val matchedName = when { + isJsEnabled && JS_LOG in files -> JS_LOG isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG isDataContainerBuildLogEnabled && DATA_CONTAINER_LOG in files -> DATA_CONTAINER_LOG SIMPLE_LOG in files -> SIMPLE_LOG diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt index 97c5cb93837..11fce2f55f3 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalCompilerRunnerTestBase.kt @@ -102,6 +102,9 @@ abstract class AbstractIncrementalCompilerRunnerTestBase, args: Args): TestCompilationResult private fun stepLogAsString(step: Int, ktSources: Iterable, errors: Collection, includeErrors: Boolean = true): String { @@ -134,7 +137,5 @@ abstract class AbstractIncrementalCompilerRunnerTestBase