Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
1216b335
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,发现更多精彩内容 >>
提交
1216b335
编写于
2月 10, 2021
作者:
D
Dmitriy Novozhilov
提交者:
TeamCityServer
2月 10, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Test] Move extracting JVM_TARGET to provideConfigurationKeys
上级
606ae45f
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
10 deletion
+4
-10
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
...ns/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
+0
-4
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
...jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
+1
-1
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
...test/services/configuration/JvmEnvironmentConfigurator.kt
+3
-5
未找到文件。
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt
浏览文件 @
1216b335
...
@@ -323,10 +323,6 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
...
@@ -323,10 +323,6 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager
services
.
registerDependencyProvider
(
DependencyProviderImpl
(
services
,
moduleStructure
.
modules
))
services
.
registerDependencyProvider
(
DependencyProviderImpl
(
services
,
moduleStructure
.
modules
))
val
keyConfiguration
=
CompilerConfiguration
()
val
keyConfiguration
=
CompilerConfiguration
()
module
.
directives
.
singleOrZeroValue
(
JvmEnvironmentConfigurationDirectives
.
JVM_TARGET
)
?.
let
{
keyConfiguration
.
put
(
JVMConfigurationKeys
.
JVM_TARGET
,
it
)
}
val
configuratorForFlags
=
JvmEnvironmentConfigurator
(
services
)
val
configuratorForFlags
=
JvmEnvironmentConfigurator
(
services
)
with
(
configuratorForFlags
)
{
with
(
configuratorForFlags
)
{
val
extractor
=
DirectiveToConfigurationKeyExtractor
()
val
extractor
=
DirectiveToConfigurationKeyExtractor
()
...
...
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/EnvironmentConfigurator.kt
浏览文件 @
1216b335
...
@@ -27,10 +27,10 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices)
...
@@ -27,10 +27,10 @@ abstract class EnvironmentConfigurator(protected val testServices: TestServices)
configuration
:
CompilerConfiguration
,
configuration
:
CompilerConfiguration
,
module
:
TestModule
,
module
:
TestModule
,
)
{
)
{
configureCompilerConfiguration
(
configuration
,
module
)
val
extractor
=
DirectiveToConfigurationKeyExtractor
()
val
extractor
=
DirectiveToConfigurationKeyExtractor
()
extractor
.
provideConfigurationKeys
()
extractor
.
provideConfigurationKeys
()
extractor
.
configure
(
configuration
,
module
.
directives
)
extractor
.
configure
(
configuration
,
module
.
directives
)
configureCompilerConfiguration
(
configuration
,
module
)
}
}
open
fun
DirectiveToConfigurationKeyExtractor
.
provideConfigurationKeys
()
{}
open
fun
DirectiveToConfigurationKeyExtractor
.
provideConfigurationKeys
()
{}
...
...
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/services/configuration/JvmEnvironmentConfigurator.kt
浏览文件 @
1216b335
...
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.test.TestJdkKind
...
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.test.TestJdkKind
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.ASSERTIONS_MODE
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.ASSERTIONS_MODE
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.CONSTRUCTOR_CALL_NORMALIZATION_MODE
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.CONSTRUCTOR_CALL_NORMALIZATION_MODE
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.JVM_TARGET
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.LAMBDAS
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.LAMBDAS
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SAM_CONVERSIONS
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.SAM_CONVERSIONS
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.STRING_CONCAT
import
org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.STRING_CONCAT
...
@@ -34,7 +35,6 @@ import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_UNIFIE
...
@@ -34,7 +35,6 @@ import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.NO_UNIFIE
import
org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.PARAMETERS_METADATA
import
org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.PARAMETERS_METADATA
import
org.jetbrains.kotlin.test.directives.model.DirectivesContainer
import
org.jetbrains.kotlin.test.directives.model.DirectivesContainer
import
org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
import
org.jetbrains.kotlin.test.directives.model.RegisteredDirectives
import
org.jetbrains.kotlin.test.directives.model.singleOrZeroValue
import
org.jetbrains.kotlin.test.model.DependencyDescription
import
org.jetbrains.kotlin.test.model.DependencyDescription
import
org.jetbrains.kotlin.test.model.DependencyKind
import
org.jetbrains.kotlin.test.model.DependencyKind
import
org.jetbrains.kotlin.test.model.TestModule
import
org.jetbrains.kotlin.test.model.TestModule
...
@@ -73,15 +73,13 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
...
@@ -73,15 +73,13 @@ class JvmEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfig
register
(
DISABLE_CALL_ASSERTIONS
,
JVMConfigurationKeys
.
DISABLE_CALL_ASSERTIONS
)
register
(
DISABLE_CALL_ASSERTIONS
,
JVMConfigurationKeys
.
DISABLE_CALL_ASSERTIONS
)
register
(
NO_UNIFIED_NULL_CHECKS
,
JVMConfigurationKeys
.
NO_UNIFIED_NULL_CHECKS
)
register
(
NO_UNIFIED_NULL_CHECKS
,
JVMConfigurationKeys
.
NO_UNIFIED_NULL_CHECKS
)
register
(
PARAMETERS_METADATA
,
JVMConfigurationKeys
.
PARAMETERS_METADATA
)
register
(
PARAMETERS_METADATA
,
JVMConfigurationKeys
.
PARAMETERS_METADATA
)
register
(
JVM_TARGET
,
JVMConfigurationKeys
.
JVM_TARGET
)
}
}
override
fun
configureCompilerConfiguration
(
configuration
:
CompilerConfiguration
,
module
:
TestModule
)
{
override
fun
configureCompilerConfiguration
(
configuration
:
CompilerConfiguration
,
module
:
TestModule
)
{
if
(
module
.
targetPlatform
!
in
JvmPlatforms
.
allJvmPlatforms
)
return
if
(
module
.
targetPlatform
!
in
JvmPlatforms
.
allJvmPlatforms
)
return
val
registeredDirectives
=
module
.
directives
registeredDirectives
.
singleOrZeroValue
(
JvmEnvironmentConfigurationDirectives
.
JVM_TARGET
)
?.
let
{
configuration
.
put
(
JVMConfigurationKeys
.
JVM_TARGET
,
it
)
}
configureDefaultJvmTarget
(
configuration
)
configureDefaultJvmTarget
(
configuration
)
val
registeredDirectives
=
module
.
directives
when
(
extractJdkKind
(
registeredDirectives
))
{
when
(
extractJdkKind
(
registeredDirectives
))
{
TestJdkKind
.
MOCK_JDK
->
{
TestJdkKind
.
MOCK_JDK
->
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录