From d5be5bd96e691795b3a3fa4b4d4436c57ce20439 Mon Sep 17 00:00:00 2001 From: Vadim Brilyantov Date: Mon, 20 May 2019 14:23:34 +0300 Subject: [PATCH] Fix obsolete compiler classpath in SourceSectionsTest --- .../org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt b/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt index bbda251fdd0..cf4cce17c52 100644 --- a/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt +++ b/plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient import org.jetbrains.kotlin.daemon.common.* +import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase.getKotlinPaths import org.jetbrains.kotlin.script.loadScriptingPlugin import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys import org.jetbrains.kotlin.scripting.definitions.StandardScriptDefinition @@ -59,7 +60,7 @@ class SourceSectionsTest : TestCaseWithTmpdir() { paths } - val compilerClassPath = listOf(kotlinPaths.compilerPath) + val compilerClassPath = getKotlinPaths().classPath(KotlinPaths.ClassPaths.Compiler) val scriptRuntimeClassPath = listOf( kotlinPaths.stdlibPath, kotlinPaths.scriptRuntimePath) val sourceSectionsPluginJar = File(kotlinPaths.libPath, "kotlin-source-sections-compiler-plugin.jar") val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }