From 17e336ea4466e98a8d2886f33f33f68e4f691293 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 7 May 2020 23:23:51 +0900 Subject: [PATCH] [CHERRY PICKED FROM IJ] Move the withIC() function to the test itself GitOrigin-RevId: 196571333c115c1f24eebc048dbfcca5c2189dfa Original commit: https://github.com/JetBrains/intellij-community/commit/1a521c2ee63b3e777b1f955b2f4cb91c28a158be --- .../jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 28b46b667f4..485e582429b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -59,7 +59,6 @@ import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.KotlinCompilerVersion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.incremental.withIC import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTestBase.LibraryDependency.* import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments @@ -1118,3 +1117,14 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { } } } + +private inline fun withIC(enabled: Boolean = true, fn: () -> R): R { + val isEnabledBackup = IncrementalCompilation.isEnabledForJvm() + IncrementalCompilation.setIsEnabledForJvm(enabled) + + try { + return fn() + } finally { + IncrementalCompilation.setIsEnabledForJvm(isEnabledBackup) + } +} \ No newline at end of file