Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
7e59e083
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7e59e083
编写于
2月 09, 2021
作者:
D
Dmitriy Novozhilov
提交者:
TeamCityServer
2月 10, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Test] Make some functions of environment configurators public
This is needed for using those methods from android tests
上级
24d6853e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
3 deletion
+6
-3
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/CompilerConfigurationProvider.kt
...ins/kotlin/test/services/CompilerConfigurationProvider.kt
+4
-1
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
...test/services/configuration/JvmEnvironmentConfigurator.kt
+2
-2
未找到文件。
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/CompilerConfigurationProvider.kt
浏览文件 @
7e59e083
...
...
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.platform.jvm.isJvm
import
org.jetbrains.kotlin.platform.konan.isNative
import
org.jetbrains.kotlin.psi.KtFile
import
org.jetbrains.kotlin.test.ApplicationEnvironmentDisposer
import
org.jetbrains.kotlin.test.TestInfrastructureInternals
import
org.jetbrains.kotlin.test.model.TestFile
import
org.jetbrains.kotlin.test.model.TestModule
import
java.io.File
...
...
@@ -67,6 +68,7 @@ open class CompilerConfigurationProviderImpl(
}
}
@OptIn
(
TestInfrastructureInternals
::
class
)
protected
open
fun
createKotlinCoreEnvironment
(
module
:
TestModule
):
KotlinCoreEnvironment
{
val
platform
=
module
.
targetPlatform
val
configFiles
=
when
{
...
...
@@ -84,11 +86,12 @@ open class CompilerConfigurationProviderImpl(
val
projectEnv
=
KotlinCoreEnvironment
.
ProjectEnvironment
(
testRootDisposable
,
applicationEnvironment
)
return
KotlinCoreEnvironment
.
createForTests
(
projectEnv
,
createCompilerConfiguration
(
module
,
projectEnv
.
project
),
createCompilerConfiguration
(
module
),
configFiles
)
}
@TestInfrastructureInternals
fun
createCompilerConfiguration
(
module
:
TestModule
):
CompilerConfiguration
{
val
configuration
=
CompilerConfiguration
()
configuration
[
CommonConfigurationKeys
.
MODULE_NAME
]
=
module
.
name
...
...
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
浏览文件 @
7e59e083
...
...
@@ -163,7 +163,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
}
}
private
fun
extractJdkKind
(
registeredDirectives
:
RegisteredDirectives
):
TestJdkKind
{
fun
extractJdkKind
(
registeredDirectives
:
RegisteredDirectives
):
TestJdkKind
{
val
fullJdkEnabled
=
JvmEnvironmentConfigurationDirectives
.
FULL_JDK
in
registeredDirectives
val
jdkKinds
=
registeredDirectives
[
JvmEnvironmentConfigurationDirectives
.
JDK_KIND
]
...
...
@@ -181,7 +181,7 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
}
}
private
fun
extractConfigurationKind
(
registeredDirectives
:
RegisteredDirectives
):
ConfigurationKind
{
fun
extractConfigurationKind
(
registeredDirectives
:
RegisteredDirectives
):
ConfigurationKind
{
val
withRuntime
=
JvmEnvironmentConfigurationDirectives
.
WITH_RUNTIME
in
registeredDirectives
||
JvmEnvironmentConfigurationDirectives
.
WITH_STDLIB
in
registeredDirectives
val
withReflect
=
JvmEnvironmentConfigurationDirectives
.
WITH_REFLECT
in
registeredDirectives
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录