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

Minor: rename setIsEnabled->setIsEnabledForJvm

Browse Source 
Original commit: 3227300f18
This commit is contained in:
Alexey Tsvetkov
2018-07-19 23:23:48 +03:00
parent 7f3cda4894
commit 7a26158177
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+2 -2
View File
@@ -115,7 +115,7 @@ abstract class AbstractIncrementalJpsTest(
super.setUp() super.setUp()
lookupsDuringTest = hashSetOf() lookupsDuringTest = hashSetOf()
isICEnabledBackup = IncrementalCompilation.isEnabledForJvm() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
if (DEBUG_LOGGING_ENABLED) { if (DEBUG_LOGGING_ENABLED) {
enableDebugLogging() enableDebugLogging()
@@ -128,7 +128,7 @@ abstract class AbstractIncrementalJpsTest(
(AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null
(AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null
lookupsDuringTest.clear() lookupsDuringTest.clear()
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.173
+3 -3
View File
@@ -114,8 +114,8 @@ abstract class AbstractIncrementalJpsTest(
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
lookupsDuringTest = hashSetOf() lookupsDuringTest = hashSetOf()
isICEnabledBackup = IncrementalCompilation.isEnabled() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
if (DEBUG_LOGGING_ENABLED) { if (DEBUG_LOGGING_ENABLED) {
enableDebugLogging() enableDebugLogging()
@@ -128,7 +128,7 @@ abstract class AbstractIncrementalJpsTest(
(AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null
(AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null
lookupsDuringTest.clear() lookupsDuringTest.clear()
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt
+3 -3
View File
@@ -41,11 +41,11 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest()
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
isICEnabledBackup = IncrementalCompilation.isEnabledForJvm() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
} }
override fun tearDown() { override fun tearDown() {
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }
@@ -67,7 +67,7 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest()
when { when {
name.endsWith("incremental-compilation") -> { name.endsWith("incremental-compilation") -> {
IncrementalCompilation.setIsEnabled(modification.dataFile.readAsBool()) IncrementalCompilation.setIsEnabledForJvm(modification.dataFile.readAsBool())
} }
} }
} }
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt
+2 -2
View File
@@ -164,11 +164,11 @@ abstract class AbstractLookupTrackerTest : TestWithWorkingDir() {
srcDir = File(workingDir, "src").apply { mkdirs() } srcDir = File(workingDir, "src").apply { mkdirs() }
outDir = File(workingDir, "out") outDir = File(workingDir, "out")
isICEnabledBackup = IncrementalCompilation.isEnabledForJvm() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
} }
override fun tearDown() { override fun tearDown() {
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt
+2 -2
View File
@@ -36,11 +36,11 @@ class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() {
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
isICEnabledBackup = IncrementalCompilation.isEnabledForJvm() isICEnabledBackup = IncrementalCompilation.isEnabledForJvm()
IncrementalCompilation.setIsEnabled(true) IncrementalCompilation.setIsEnabledForJvm(true)
} }
override fun tearDown() { override fun tearDown() {
IncrementalCompilation.setIsEnabled(isICEnabledBackup) IncrementalCompilation.setIsEnabledForJvm(isICEnabledBackup)
super.tearDown() super.tearDown()
} }