azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR Native] Stop requiring :dist for native diagnostic test

Browse Source 
Native uses its own klib stdlib generated
via `:kotlin-native:dist`.
This commit is contained in:
Nikolay Lunyak
2023-06-05 14:00:30 +03:00
committed by Space Team
parent 0f4cca6877
commit 45bbd432fc
10 changed files with 43 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/CommonEnvironmentConfigurator.kt
+6 -8
View File
@@ -13,7 +13,7 @@ import org.jetbrains.kotlin.config.AnalysisFlags.allowFullyQualifiedNameInKClass
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.config.CompilerConfigurationKey
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.platform.CommonPlatforms
import org.jetbrains.kotlin.platform.isCommon
import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB
import org.jetbrains.kotlin.test.directives.model.DirectivesContainer
@@ -43,13 +43,11 @@ class CommonEnvironmentConfigurator(testServices: TestServices) : EnvironmentCon
configuration.put(key as CompilerConfigurationKey<Any>, value)
}
if (module.targetPlatform in CommonPlatforms.allDefaultTargetPlatforms) {
if (WITH_STDLIB in module.directives) {
configuration.add(
CLIConfigurationKeys.CONTENT_ROOTS,
JvmClasspathRoot(ForTestCompileRuntime.stdlibCommonForTests())
)
}
if (module.targetPlatform.isCommon() && WITH_STDLIB in module.directives) {
configuration.add(
CLIConfigurationKeys.CONTENT_ROOTS,
JvmClasspathRoot(ForTestCompileRuntime.stdlibCommonForTests())
)
}
}
}