From 208051b314be593c7588eb168f759d330d845017 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Thu, 5 Oct 2017 00:51:35 +0300 Subject: [PATCH] Do not run annotation processor in javac integrated tests Annotation processor can be found in javaslang-2.0.6.jar library. This jar should be in classpath because it used in compiler (not as annotation processor of course). Before migration to GSK this library was also in classpath and it isn't clear, why it not recognised as an annotation processor. Anyway, for this tests we should'nt run annotation processors --- .../jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt index e134d76f287..a0ec05017a0 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt @@ -81,7 +81,8 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() { environment.configuration.put(JVMConfigurationKeys.COMPILE_JAVA, true) environment.configuration.put(JVMConfigurationKeys.OUTPUT_DIRECTORY, outDir) environment.registerJavac(javaFiles = javaFiles, - kotlinFiles = listOf(KotlinTestUtils.loadJetFile(environment.project, ktFiles.first()))) + kotlinFiles = listOf(KotlinTestUtils.loadJetFile(environment.project, ktFiles.first())), + arguments = arrayOf("-proc:none")) if (!ktFiles.isEmpty()) { LoadDescriptorUtil.compileKotlinToDirAndGetModule(ktFiles, outDir, environment) }