FIR IC: fix test with behavior different from non-tight cycle variants
This commit is contained in:
@@ -25,6 +25,7 @@ data class BuildLogFinder(
|
|||||||
private val isScopeExpansionEnabled: Boolean = false,
|
private val isScopeExpansionEnabled: Boolean = false,
|
||||||
private val isKlibEnabled: Boolean = false,
|
private val isKlibEnabled: Boolean = false,
|
||||||
private val isFirEnabled: Boolean = false,
|
private val isFirEnabled: Boolean = false,
|
||||||
|
private val isFirIcEnabled: Boolean = false,
|
||||||
private val isJpsBuild: Boolean = false,
|
private val isJpsBuild: Boolean = false,
|
||||||
) {
|
) {
|
||||||
companion object {
|
companion object {
|
||||||
@@ -34,6 +35,7 @@ data class BuildLogFinder(
|
|||||||
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"
|
||||||
const val JS_JPS_LOG = "js-jps-build.log"
|
const val JS_JPS_LOG = "js-jps-build.log"
|
||||||
|
private const val FIR_IC_LOG = "fir-ic-build.log"
|
||||||
private const val FIR_LOG = "fir-build.log"
|
private const val FIR_LOG = "fir-build.log"
|
||||||
private const val GRADLE_FIR_LOG = "gradle-fir-build.log"
|
private const val GRADLE_FIR_LOG = "gradle-fir-build.log"
|
||||||
const val JPS_LOG = "jps-build.log"
|
const val JPS_LOG = "jps-build.log"
|
||||||
@@ -51,6 +53,7 @@ data class BuildLogFinder(
|
|||||||
isScopeExpansionEnabled && SCOPE_EXPANDING_LOG in files -> SCOPE_EXPANDING_LOG
|
isScopeExpansionEnabled && SCOPE_EXPANDING_LOG in files -> SCOPE_EXPANDING_LOG
|
||||||
isKlibEnabled && KLIB_LOG in files -> KLIB_LOG
|
isKlibEnabled && KLIB_LOG in files -> KLIB_LOG
|
||||||
isJsEnabled && JS_LOG in files -> JS_LOG
|
isJsEnabled && JS_LOG in files -> JS_LOG
|
||||||
|
isFirIcEnabled && FIR_IC_LOG in files -> FIR_IC_LOG
|
||||||
isGradleEnabled && isFirEnabled && GRADLE_FIR_LOG in files -> GRADLE_FIR_LOG
|
isGradleEnabled && isFirEnabled && GRADLE_FIR_LOG in files -> GRADLE_FIR_LOG
|
||||||
isFirEnabled && FIR_LOG in files -> FIR_LOG
|
isFirEnabled && FIR_LOG in files -> FIR_LOG
|
||||||
isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG
|
isGradleEnabled && GRADLE_LOG in files -> GRADLE_LOG
|
||||||
|
|||||||
+1
-1
@@ -19,5 +19,5 @@ abstract class AbstractIncrementalFirICLightTreeJvmCompilerRunnerTest : Abstract
|
|||||||
}
|
}
|
||||||
|
|
||||||
override val buildLogFinder: BuildLogFinder
|
override val buildLogFinder: BuildLogFinder
|
||||||
get() = BuildLogFinder(isGradleEnabled = true, isFirEnabled = true) // TODO: investigate cases that need isGradleEnabled - the combination looks fragile
|
get() = BuildLogFinder(isGradleEnabled = true, isFirEnabled = true, isFirIcEnabled = true) // TODO: investigate cases that need isGradleEnabled - the combination looks fragile
|
||||||
}
|
}
|
||||||
|
|||||||
+33
@@ -0,0 +1,33 @@
|
|||||||
|
================ Step #1 =================
|
||||||
|
|
||||||
|
Cleaning output files:
|
||||||
|
out/production/module/A.class
|
||||||
|
out/production/module/META-INF/module.kotlin_module
|
||||||
|
End of files
|
||||||
|
Compiling files:
|
||||||
|
src/A.kt
|
||||||
|
End of files
|
||||||
|
Exit code: ABORT
|
||||||
|
------------------------------------------
|
||||||
|
COMPILATION FAILED
|
||||||
|
Conflicting overloads: [public final fun A(x: R|kotlin/String|): R|A|
|
||||||
|
]
|
||||||
|
|
||||||
|
================ Step #2 =================
|
||||||
|
|
||||||
|
Cleaning output files:
|
||||||
|
out/production/module/AConstructorFunctionKt.class
|
||||||
|
End of files
|
||||||
|
Cleaning output files:
|
||||||
|
out/production/module/CreateAFromStringKt.class
|
||||||
|
End of files
|
||||||
|
Compiling files:
|
||||||
|
src/A.kt
|
||||||
|
src/AChild.kt
|
||||||
|
src/AConstructorFunction.kt
|
||||||
|
src/createAFromInt.kt
|
||||||
|
src/createAFromString.kt
|
||||||
|
src/useA.kt
|
||||||
|
End of files
|
||||||
|
Exit code: OK
|
||||||
|
------------------------------------------
|
||||||
Reference in New Issue
Block a user