From 4017195ff142c03fe39fdf5643af34f985d3db64 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 15 Nov 2017 14:00:58 +0100 Subject: [PATCH] Always include stdlib in IrTests --- .../ir/AbstractIrBlackBoxCodegenTest.java | 29 ---------------- .../ir/AbstractIrBlackBoxCodegenTest.kt | 34 +++++++++++++++++++ .../ir/AbstractIrBlackBoxInlineCodegenTest.kt | 3 ++ ...tIrCompileKotlinAgainstInlineKotlinTest.kt | 3 ++ 4 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java create mode 100644 compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java deleted file mode 100644 index 7fdae7140e0..00000000000 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010-2016 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.codegen.ir; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.config.JVMConfigurationKeys; - -public abstract class AbstractIrBlackBoxCodegenTest extends AbstractBlackBoxCodegenTest { - @Override - protected void updateConfiguration(@NotNull CompilerConfiguration configuration) { - configuration.put(JVMConfigurationKeys.IR, true); - } -} diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt new file mode 100644 index 00000000000..8ce9a0e58fa --- /dev/null +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxCodegenTest.kt @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2016 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.codegen.ir + +import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest +import org.jetbrains.kotlin.config.CompilerConfiguration +import org.jetbrains.kotlin.config.JVMConfigurationKeys +import org.jetbrains.kotlin.test.ConfigurationKind + +abstract class AbstractIrBlackBoxCodegenTest : AbstractBlackBoxCodegenTest() { + override fun updateConfiguration(configuration: CompilerConfiguration) { + configuration.put(JVMConfigurationKeys.IR, true) + } + + //symbols are constructed with stdlib descriptors so stdlib should be presented + // TODO rewrite symbols building + override fun extractConfigurationKind(files: MutableList): ConfigurationKind { + return ConfigurationKind.ALL + } +} diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt index d62fe2b1e06..c148c607410 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrBlackBoxInlineCodegenTest.kt @@ -19,7 +19,10 @@ package org.jetbrains.kotlin.codegen.ir import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys +import org.jetbrains.kotlin.test.ConfigurationKind abstract class AbstractIrBlackBoxInlineCodegenTest: AbstractBlackBoxCodegenTest() { override fun updateConfiguration(configuration: CompilerConfiguration) = configuration.put(JVMConfigurationKeys.IR, true) + + override fun extractConfigurationKind(files: MutableList): ConfigurationKind = ConfigurationKind.ALL } \ No newline at end of file diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt index 4598e34d8d3..9be9cefe7f8 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstInlineKotlinTest.kt @@ -19,7 +19,10 @@ package org.jetbrains.kotlin.codegen.ir import org.jetbrains.kotlin.codegen.AbstractCompileKotlinAgainstInlineKotlinTest import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys +import org.jetbrains.kotlin.test.ConfigurationKind abstract class AbstractIrCompileKotlinAgainstInlineKotlinTest : AbstractCompileKotlinAgainstInlineKotlinTest() { override fun updateConfiguration(configuration: CompilerConfiguration) = configuration.put(JVMConfigurationKeys.IR, true) + + override fun extractConfigurationKind(files: MutableList): ConfigurationKind = ConfigurationKind.ALL } \ No newline at end of file