From 316cdc13dce8385a8a68b19cc14152ebc84429fe Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 28 Jul 2017 15:21:06 +0300 Subject: [PATCH] Ensure IC.isEnabled is not modified by tests Original commit: 69b4d213b7cee980795c8aa78db3e96f72b79575 --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 3 +++ .../jps/build/AbstractIncrementalLazyCachesTest.kt | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 76dfa819f81..f3d2effd435 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -75,6 +75,7 @@ abstract class AbstractIncrementalJpsTest( protected lateinit var workDir: File protected lateinit var projectDescriptor: ProjectDescriptor protected lateinit var lookupsDuringTest: MutableSet + private var isICEnabledBackup: Boolean = false protected var mapWorkingToOriginalFile: MutableMap = hashMapOf() @@ -110,6 +111,7 @@ abstract class AbstractIncrementalJpsTest( override fun setUp() { super.setUp() lookupsDuringTest = hashSetOf() + isICEnabledBackup = IncrementalCompilation.isEnabled() IncrementalCompilation.setIsEnabled(true) if (DEBUG_LOGGING_ENABLED) { @@ -123,6 +125,7 @@ abstract class AbstractIncrementalJpsTest( (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null lookupsDuringTest.clear() + IncrementalCompilation.setIsEnabled(isICEnabledBackup) super.tearDown() } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index f850f07cd81..bdab61993f6 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -34,6 +34,19 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() private val expectedCachesFileName: String get() = "expected-kotlin-caches.txt" + private var isICEnabledBackup: Boolean = false + + override fun setUp() { + super.setUp() + isICEnabledBackup = IncrementalCompilation.isEnabled() + IncrementalCompilation.setIsEnabled(true) + } + + override fun tearDown() { + IncrementalCompilation.setIsEnabled(isICEnabledBackup) + super.tearDown() + } + override fun doTest(testDataPath: String) { super.doTest(testDataPath)