Move jvm ir tests to jvm ones

2018-08-02 13:52:52 +02:00
parent 0e8b93bf35
commit ddf6bdffcf
10 changed files with 1 additions and 29 deletions
@@ -100,8 +100,6 @@ sourceSets {
    "main" {}
    "test" {
        projectDefault()
-        // not yet ready
-//        java.srcDir("tests-ir-jvm/tests")
    }
 }

@@ -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
@@ -1,4 +1,3 @@
-// IGNORE_BACKEND: JVM_IR
 // FILE: inline.kt
 // KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
 // WITH_RUNTIME
@@ -1,3 +1,4 @@
+// IGNORE_BACKEND: JVM_IR
 // FILE: inline.kt
 // KOTLIN_CONFIGURATION_FLAGS: ASSERTIONS_MODE=jvm
 // WITH_RUNTIME
@@ -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)
-}
@@ -347,9 +347,7 @@ fun main(args: Array<String>) {
        testClass<AbstractKDocLexerTest> {
            model("kdoc/lexer")
        }
-    }

-    testGroup("compiler/tests-ir-jvm/tests", "compiler/testData") {
        testClass<AbstractIrBlackBoxCodegenTest> {
            model("codegen/box", targetBackend = TargetBackend.JVM_IR)
        }
@@ -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",