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

[KLIB IC] Support special klib-build.log in IC test infrastructure

Browse Source
This commit is contained in:
Roman Artemev
2020-12-02 13:32:37 +03:00
parent 96ba3b873e
commit 380225e0cb
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt
+4 -1
View File
@@ -23,11 +23,13 @@ data class BuildLogFinder(
private val isGradleEnabled: Boolean = false, private val isGradleEnabled: Boolean = false,
private val isJsEnabled: Boolean = false, private val isJsEnabled: Boolean = false,
private val isJsIrEnabled: Boolean = false, // TODO rename as it is used for metadata-only test private val isJsIrEnabled: Boolean = false, // TODO rename as it is used for metadata-only test
private val isScopeExpansionEnabled: Boolean = false private val isScopeExpansionEnabled: Boolean = false,
private val isKlibEnabled: Boolean = false
) { ) {
companion object { companion object {
private const val JS_LOG = "js-build.log" private const val JS_LOG = "js-build.log"
private const val JS_IR_LOG = "js-ir-build.log" private const val JS_IR_LOG = "js-ir-build.log"
private const val KLIB_LOG = "klib-build.log"
private const val SCOPE_EXPANDING_LOG = "build-with-scope-expansion.log" private const val SCOPE_EXPANDING_LOG = "build-with-scope-expansion.log"
private const val GRADLE_LOG = "gradle-build.log" private const val GRADLE_LOG = "gradle-build.log"
private const val DATA_CONTAINER_LOG = "data-container-version-build.log" private const val DATA_CONTAINER_LOG = "data-container-version-build.log"
@@ -44,6 +46,7 @@ data class BuildLogFinder(
val matchedName = when { val matchedName = when {
isScopeExpansionEnabled && SCOPE_EXPANDING_LOG in files -> SCOPE_EXPANDING_LOG isScopeExpansionEnabled && SCOPE_EXPANDING_LOG in files -> SCOPE_EXPANDING_LOG
isJsIrEnabled && JS_IR_LOG in files -> JS_IR_LOG isJsIrEnabled && JS_IR_LOG in files -> JS_IR_LOG
isKlibEnabled && KLIB_LOG in files -> KLIB_LOG
isJsEnabled && JS_LOG in files -> JS_LOG isJsEnabled && JS_LOG in files -> JS_LOG
isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG
isJsEnabled && JS_JPS_LOG in files -> JS_JPS_LOG isJsEnabled && JS_JPS_LOG in files -> JS_JPS_LOG
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt
+1 -1
View File
@@ -16,7 +16,7 @@ abstract class AbstractIncrementalJsKlibCompilerRunnerTest : AbstractIncremental
} }
override val buildLogFinder: BuildLogFinder override val buildLogFinder: BuildLogFinder
get() = super.buildLogFinder.copy(isJsIrEnabled = true) get() = super.buildLogFinder.copy(isJsIrEnabled = true, isKlibEnabled = true)
} }
abstract class AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest : AbstractIncrementalJsKlibCompilerRunnerTest() { abstract class AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest : AbstractIncrementalJsKlibCompilerRunnerTest() {