Fix configuration for FastClassReading foreign-annotations tests

Prior to this change USE_FAST_CLASS_FILES_READING actually
has not worked because the flag is being read in the KotlinCoreEnvironment
constructor 🤦‍♂️
This commit is contained in:
Denis Zharkov
2017-09-11 10:51:31 +03:00
parent fd9025a4fb
commit 08f3dbce67
2 changed files with 7 additions and 12 deletions
@@ -86,20 +86,15 @@ public abstract class KotlinMultiFileTestWithJava<M, F> extends KtUsefulTestCase
ContentRootsKt.addKotlinSourceRoot(configuration, kotlinSourceRoot.getPath());
}
KotlinCoreEnvironment environment =
KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles());
performCustomConfiguration(
environment
);
return environment;
performCustomConfiguration(configuration);
return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles());
}
protected boolean isJavaSourceRootNeeded() {
return true;
}
protected void performCustomConfiguration(@NotNull KotlinCoreEnvironment environment) {
protected void performCustomConfiguration(@NotNull CompilerConfiguration configuration) {
}
@@ -16,12 +16,12 @@
package org.jetbrains.kotlin.checkers
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.JVMConfigurationKeys
abstract class AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest : AbstractForeignAnnotationsNoAnnotationInClasspathTest() {
override fun performCustomConfiguration(environment: KotlinCoreEnvironment) {
super.performCustomConfiguration(environment)
environment.configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true)
override fun performCustomConfiguration(configuration: CompilerConfiguration) {
super.performCustomConfiguration(configuration)
configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true)
}
}