From 9eeee6aad78515145b0ef9120c9f90231b57791f Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 2 Mar 2020 16:05:41 +0300 Subject: [PATCH] [FIR-TEST] Move FirBlackBoxCodegenTestGenerated to `:fir2ir` module --- build.gradle.kts | 1 - compiler/build.gradle.kts | 8 -------- .../codegen/ir/FirBlackBoxCodegenTestGenerated.java | 0 .../kotlin/generators/tests/GenerateCompilerTests.kt | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) rename compiler/{ => fir/fir2ir}/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 3b2cd1c1b85..075e9ec441d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -559,7 +559,6 @@ tasks { ":compiler:fir:lightTree:test", ":compiler:fir:resolve:test", ":compiler:fir:fir2ir:test", - ":compiler:firBlackBox:test", ":idea:firTest" ) } diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index 4ef2ea5e2e2..3ca128f2cf8 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -118,11 +118,3 @@ projectTest(parallel = true) { val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateCompilerTestsKt") testsJar() - -projectTest("firBlackBoxTest", parallel = true) { - dependsOn(":dist") - workingDir = rootDir - filter { - includeTestsMatching("org.jetbrains.kotlin.codegen.ir.FirBlackBoxCodegenTestGenerated") - } -} \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java rename to compiler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt index 3f54db2701b..a4e2c992792 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt @@ -511,7 +511,7 @@ fun main(args: Array) { } testGroup( - "compiler/tests", "compiler/testData", + "compiler/fir/fir2ir/tests", "compiler/testData", testRunnerMethodName = "runTestWithCustomIgnoreDirective", additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_FIR: \"") ) {