From 350ff8033d5b1d340fbc39d44702b4b6f33889c6 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Mon, 21 Dec 2020 18:22:13 +0300 Subject: [PATCH] [IC KLIB] Replace JS IR build log with KLIB build log for klib compialtion - fix test data --- .../kotlin/incremental/testingUtils/BuildLogFinder.kt | 3 --- .../AbstractIncrementalJsCompilerRunnerWithMetadataOnlyTest.kt | 2 +- .../incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt | 2 +- .../AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest.kt | 2 +- .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../inlineLinesChanged/{js-ir-build.log => klib-build.log} | 0 .../inlinePropertyInClass/{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 15 files changed, 3 insertions(+), 6 deletions(-) rename jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/{js-ir-build.log => klib-build.log} (100%) rename jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/{js-ir-build.log => klib-build.log} (100%) 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 68efcbad1c1..e4e3ef196e5 100644 --- a/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt +++ b/build-common/test/org/jetbrains/kotlin/incremental/testingUtils/BuildLogFinder.kt @@ -22,13 +22,11 @@ data class BuildLogFinder( private val isDataContainerBuildLogEnabled: Boolean = false, private val isGradleEnabled: Boolean = false, private val isJsEnabled: Boolean = false, - private val isJsIrEnabled: Boolean = false, // TODO rename as it is used for metadata-only test private val isScopeExpansionEnabled: Boolean = false, private val isKlibEnabled: Boolean = false ) { companion object { private const val JS_LOG = "js-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 GRADLE_LOG = "gradle-build.log" @@ -45,7 +43,6 @@ data class BuildLogFinder( val files = names.filter { File(dir, it).isFile }.toSet() val matchedName = when { isScopeExpansionEnabled && SCOPE_EXPANDING_LOG in files -> SCOPE_EXPANDING_LOG - isJsIrEnabled && JS_IR_LOG in files -> JS_IR_LOG isKlibEnabled && KLIB_LOG in files -> KLIB_LOG isJsEnabled && JS_LOG in files -> JS_LOG isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerWithMetadataOnlyTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerWithMetadataOnlyTest.kt index d3b04577f27..f69ca258ba3 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerWithMetadataOnlyTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsCompilerRunnerWithMetadataOnlyTest.kt @@ -16,5 +16,5 @@ abstract class AbstractIncrementalJsCompilerRunnerWithMetadataOnlyTest : Abstrac } override val buildLogFinder: BuildLogFinder - get() = super.buildLogFinder.copy(isJsIrEnabled = true) + get() = super.buildLogFinder.copy(isKlibEnabled = true) } \ No newline at end of file diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt index 9c445923a3f..6b9e690cc4f 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJsKlibCompilerRunnerTest.kt @@ -17,7 +17,7 @@ abstract class AbstractIncrementalJsKlibCompilerRunnerTest : AbstractIncremental } override val buildLogFinder: BuildLogFinder - get() = super.buildLogFinder.copy(isJsIrEnabled = true, isKlibEnabled = true) + get() = super.buildLogFinder.copy(isKlibEnabled = true) } abstract class AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest : AbstractIncrementalJsKlibCompilerRunnerTest() { diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest.kt index e36e7d574ce..99344df951c 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest.kt @@ -28,7 +28,7 @@ abstract class AbstractIncrementalMultiModuleJsKlibCompilerRunnerTest : } override val buildLogFinder: BuildLogFinder - get() = super.buildLogFinder.copy(isJsIrEnabled = true, isKlibEnabled = true) + get() = super.buildLogFinder.copy(isKlibEnabled = true) override fun makeForSingleModule( moduleCacheDir: File, diff --git a/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-ir-build.log b/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-ir-build.log rename to jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/klib-build.log diff --git a/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-ir-build.log b/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-ir-build.log rename to jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/klib-build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/js-ir-build.log b/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/klib-build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/js-ir-build.log rename to jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/klib-build.log