From f33255c990cd2229b55361a29399556f928d2c9a Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 7 Nov 2017 14:20:41 +0300 Subject: [PATCH] Add jetbrains annotations to javac classpath in IncrementalJvmCompilerRunnerTest Before this change some of these tests were failing --- .../AbstractIncrementalJvmCompilerRunnerTest.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt index b219f00704f..b125bc5680c 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.incremental.utils.TestCompilationResult import org.jetbrains.kotlin.incremental.utils.TestICReporter import org.jetbrains.kotlin.incremental.utils.TestMessageCollector +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.ByteArrayOutputStream import java.io.File import javax.tools.ToolProvider @@ -75,7 +76,8 @@ abstract class AbstractIncrementalJvmCompilerRunnerTest : AbstractIncrementalCom } private val compileClasspath = - listOf(File(bootstrapKotlincLib, "kotlin-stdlib.jar")) - .map { it.canonicalPath } - .joinToString(File.pathSeparator) -} \ No newline at end of file + listOf( + File(bootstrapKotlincLib, "kotlin-stdlib.jar"), + KotlinTestUtils.getAnnotationsJar() + ).joinToString(File.pathSeparator) { it.canonicalPath } +}