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

Enable disabling incremental compilation for tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-09-24 23:26:53 +03:00
parent b6bbc4015b
commit 68437175f6
8 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
+1 -1
View File
@@ -247,7 +247,7 @@ public class MultifileClassCodegen(
}
private fun getCompiledPackageFragment(packageFqName: FqName, state: GenerationState): PackageFragmentDescriptor? =
if (!IncrementalCompilation.ENABLED) null
if (!IncrementalCompilation.isEnabled()) null
else state.module.getPackage(packageFqName).fragments.firstOrNull { fragment ->
fragment is IncrementalPackageFragmentProvider.IncrementalPackageFragment &&
fragment.target == state.targetId
compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class PackageCodegen {
@Nullable
private PackageFragmentDescriptor getCompiledPackageFragment(@NotNull FqName fqName) {
if (!IncrementalCompilation.ENABLED) {
if (!IncrementalCompilation.isEnabled()) {
return null;
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+1 -1
View File
@@ -65,7 +65,7 @@ public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
val configuration = CompilerConfiguration()
configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageSeverityCollector)
if (IncrementalCompilation.ENABLED) {
if (IncrementalCompilation.isEnabled()) {
val incrementalCompilationComponents = services.get(javaClass<IncrementalCompilationComponents>())
configuration.put(JVMConfigurationKeys.INCREMENTAL_COMPILATION_COMPONENTS, incrementalCompilationComponents)
}
compiler/util/src/org/jetbrains/kotlin/config/IncrementalCompilation.java
+18 -2
View File
@@ -16,6 +16,22 @@
package org.jetbrains.kotlin.config;
import org.jetbrains.annotations.TestOnly;
public class IncrementalCompilation {
public static final boolean ENABLED = !"false".equals(System.getProperty("kotlin.incremental.compilation"));
}
private static final String INCREMENTAL_COMPILATION_PROPERTY = "kotlin.incremental.compilation";
public static boolean isEnabled() {
return !"false".equals(System.getProperty(INCREMENTAL_COMPILATION_PROPERTY));
}
@TestOnly
public static void disableIncrementalCompilation() {
System.setProperty(INCREMENTAL_COMPILATION_PROPERTY, "false");
}
@TestOnly
public static void enableIncrementalCompilation() {
System.setProperty(INCREMENTAL_COMPILATION_PROPERTY, "true");
}
}