From ddf6bdffcf428c7932544c0bd3d0bcdbb5f9e0d2 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 2 Aug 2018 13:52:52 +0200 Subject: [PATCH] Move jvm ir tests to jvm ones --- compiler/build.gradle.kts | 2 -- .../codegen/box/reified/instanceof.kt | 1 - ...mAssertInlineFunctionAssertionsDisabled.kt | 1 - ...vmAssertInlineFunctionAssertionsEnabled.kt | 1 + compiler/tests-ir-jvm/build.gradle.kts | 22 ------------------- ...ackBoxAgainstJavaCodegenTestGenerated.java | 0 .../ir/IrBlackBoxCodegenTestGenerated.java | 0 .../IrBlackBoxInlineCodegenTestGenerated.java | 0 .../generators/tests/GenerateCompilerTests.kt | 2 -- settings.gradle | 1 - 10 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 compiler/tests-ir-jvm/build.gradle.kts rename compiler/{tests-ir-jvm => }/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java (100%) rename compiler/{tests-ir-jvm => }/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java (100%) rename compiler/{tests-ir-jvm => }/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java (100%) diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 321a6f94b94..dcec1b4dffb 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -100,8 +100,6 @@ sourceSets { "main" {} "test" { projectDefault() - // not yet ready -// java.srcDir("tests-ir-jvm/tests") } } diff --git a/compiler/testData/codegen/box/reified/instanceof.kt b/compiler/testData/codegen/box/reified/instanceof.kt index 48e430c23cb..49a8988abfd 100644 --- a/compiler/testData/codegen/box/reified/instanceof.kt +++ b/compiler/testData/codegen/box/reified/instanceof.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR // IGNORE_BACKEND: JS_IR // TODO: muted automatically, investigate should it be ran for JS or not // IGNORE_BACKEND: JS diff --git a/compiler/testData/codegen/boxInline/assert/jvmAssertInlineFunctionAssertionsDisabled.kt b/compiler/testData/codegen/boxInline/assert/jvmAssertInlineFunctionAssertionsDisabled.kt index dea550b4b9a..1ba6976e652 100644 --- a/compiler/testData/codegen/boxInline/assert/jvmAssertInlineFunctionAssertionsDisabled.kt +++ b/compiler/testData/codegen/boxInline/assert/jvmAssertInlineFunctionAssertionsDisabled.kt @@ -1,4 +1,3 @@ -// IGNORE_BACKEND: JVM_IR // FILE: inline.kt // KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm // WITH_RUNTIME diff --git a/compiler/testData/codegen/boxInline/assert/jvmAssertInlineFunctionAssertionsEnabled.kt b/compiler/testData/codegen/boxInline/assert/jvmAssertInlineFunctionAssertionsEnabled.kt index 51de71633bb..d5fc1c72a26 100644 --- a/compiler/testData/codegen/boxInline/assert/jvmAssertInlineFunctionAssertionsEnabled.kt +++ b/compiler/testData/codegen/boxInline/assert/jvmAssertInlineFunctionAssertionsEnabled.kt @@ -1,3 +1,4 @@ +// IGNORE_BACKEND: JVM_IR // FILE: inline.kt // KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm // WITH_RUNTIME diff --git a/compiler/tests-ir-jvm/build.gradle.kts b/compiler/tests-ir-jvm/build.gradle.kts deleted file mode 100644 index 760fdde8c35..00000000000 --- a/compiler/tests-ir-jvm/build.gradle.kts +++ /dev/null @@ -1,22 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectDist(":kotlin-script-runtime")) - testCompile(projectDist(":kotlin-stdlib")) - testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) -} - -sourceSets { - "main" { } - "test" { projectDefault() } -} - -projectTest { - workingDir = rootDir - maxParallelForks = Math.max(Runtime.getRuntime().availableProcessors() / 2, 1) -} diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java similarity index 100% rename from compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxAgainstJavaCodegenTestGenerated.java diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java similarity index 100% rename from compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java diff --git a/compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java similarity index 100% rename from compiler/tests-ir-jvm/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxInlineCodegenTestGenerated.java diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index ea050df340b..7d023404199 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -347,9 +347,7 @@ fun main(args: Array) { testClass { model("kdoc/lexer") } - } - testGroup("compiler/tests-ir-jvm/tests", "compiler/testData") { testClass { model("codegen/box", targetBackend = TargetBackend.JVM_IR) } diff --git a/settings.gradle b/settings.gradle index 0f10a910c31..0121f440313 100644 --- a/settings.gradle +++ b/settings.gradle @@ -132,7 +132,6 @@ include ":kotlin-build-common", ":kotlin-reflect-api", ":kotlin-ant", ":compiler:tests-java8", - ":compiler:tests-ir-jvm", ":generators", ":generators:test-generator", ":tools:binary-compatibility-validator",