From cf59f84273f17647a6dfb4dac6e9c94e8ee2b129 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 13 Dec 2017 19:19:43 +0100 Subject: [PATCH] Fix lookup tracker tests after 83b32e11a7f Standard library is no longer automatically added to the classpath when -Xbuild-file is used. Before 83b32e11a7f, these tests worked because no matter whether -Xbuild-file was used or not, the automatically computed classpath (which erroneously was used to populate content roots in the compiler) contained the standard library (see K2JVMCompiler.configureContentRoots) Original commit: 9e82ab38f03dcb0b372510f12aaa410f2090ba6e --- .../jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index c281bc1346e..19f869fd1df 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.compilerRunner.* import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services @@ -81,7 +82,7 @@ abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() { outputDir = outDir, sourcesToCompile = filesToCompile.toList(), javaSourceRoots = listOf(JvmSourceRoot(srcDir, null)), - classpath = listOf(outDir).filter { it.exists() }, + classpath = listOf(outDir, ForTestCompileRuntime.runtimeJarForTests()).filter { it.exists() }, friendDirs = emptyList() )