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

Fix configuration for FastClassReading foreign-annotations tests

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java
+3 -8
View File
@@ -86,20 +86,15 @@ public abstract class KotlinMultiFileTestWithJava<M, F> extends KtUsefulTestCase
ContentRootsKt.addKotlinSourceRoot(configuration, kotlinSourceRoot.getPath()); ContentRootsKt.addKotlinSourceRoot(configuration, kotlinSourceRoot.getPath());
} }
KotlinCoreEnvironment environment = performCustomConfiguration(configuration);
KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles()); return KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, getEnvironmentConfigFiles());
performCustomConfiguration(
environment
);
return environment;
} }
protected boolean isJavaSourceRootNeeded() { protected boolean isJavaSourceRootNeeded() {
return true; return true;
} }
protected void performCustomConfiguration(@NotNull KotlinCoreEnvironment environment) { protected void performCustomConfiguration(@NotNull CompilerConfiguration configuration) {
} }
compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest.kt
+4 -4
View File
@@ -16,12 +16,12 @@
package org.jetbrains.kotlin.checkers 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 import org.jetbrains.kotlin.config.JVMConfigurationKeys
abstract class AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest : AbstractForeignAnnotationsNoAnnotationInClasspathTest() { abstract class AbstractForeignAnnotationsNoAnnotationInClasspathWithFastClassReadingTest : AbstractForeignAnnotationsNoAnnotationInClasspathTest() {
override fun performCustomConfiguration(environment: KotlinCoreEnvironment) { override fun performCustomConfiguration(configuration: CompilerConfiguration) {
super.performCustomConfiguration(environment) super.performCustomConfiguration(configuration)
environment.configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true) configuration.put(JVMConfigurationKeys.USE_FAST_CLASS_FILES_READING, true)
} }
} }