Tests: use standard script definition in cli tests by default
This commit is contained in:
@@ -106,6 +106,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
|
|||||||
import org.jetbrains.kotlin.script.ScriptDefinitionProvider
|
import org.jetbrains.kotlin.script.ScriptDefinitionProvider
|
||||||
import org.jetbrains.kotlin.script.ScriptDependenciesProvider
|
import org.jetbrains.kotlin.script.ScriptDependenciesProvider
|
||||||
import org.jetbrains.kotlin.script.ScriptReportSink
|
import org.jetbrains.kotlin.script.ScriptReportSink
|
||||||
|
import org.jetbrains.kotlin.script.StandardScriptDefinition
|
||||||
import org.jetbrains.kotlin.utils.PathUtil
|
import org.jetbrains.kotlin.utils.PathUtil
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.util.zip.ZipFile
|
import java.util.zip.ZipFile
|
||||||
@@ -420,15 +421,15 @@ class KotlinCoreEnvironment private constructor(
|
|||||||
@JvmStatic fun createForTests(
|
@JvmStatic fun createForTests(
|
||||||
parentDisposable: Disposable, configuration: CompilerConfiguration, extensionConfigs: EnvironmentConfigFiles
|
parentDisposable: Disposable, configuration: CompilerConfiguration, extensionConfigs: EnvironmentConfigFiles
|
||||||
): KotlinCoreEnvironment {
|
): KotlinCoreEnvironment {
|
||||||
|
val config = configuration.copy()
|
||||||
|
if (config.getList(JVMConfigurationKeys.SCRIPT_DEFINITIONS).isEmpty()) {
|
||||||
|
config.add(JVMConfigurationKeys.SCRIPT_DEFINITIONS, StandardScriptDefinition)
|
||||||
|
}
|
||||||
// Tests are supposed to create a single project and dispose it right after use
|
// Tests are supposed to create a single project and dispose it right after use
|
||||||
return KotlinCoreEnvironment(parentDisposable,
|
return KotlinCoreEnvironment(parentDisposable,
|
||||||
createApplicationEnvironment(
|
createApplicationEnvironment(parentDisposable, config, extensionConfigs.files,
|
||||||
parentDisposable,
|
unitTestMode = true),
|
||||||
configuration,
|
config,
|
||||||
extensionConfigs.files,
|
|
||||||
unitTestMode = true
|
|
||||||
),
|
|
||||||
configuration,
|
|
||||||
extensionConfigs)
|
extensionConfigs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user