Configuration: move scratch tests to separate module

generators/build.gradle.kts

@@ -19,6 +19,7 @@ dependencies {
     compile(projectTests(":j2k"))
     compile(projectTests(":nj2k"))
     compile(projectTests(":idea:idea-android"))
+    compile(projectTests(":idea:scripting-support"))
     compile(projectTests(":jps-plugin"))
     compile(projectTests(":plugins:jvm-abi-gen"))
     compile(projectTests(":plugins:android-extensions-compiler"))

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -843,6 +843,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model(
                 "scratch",
@@ -888,14 +898,6 @@ fun main(args: Array<String>) {
         testClass<AbstractScratchLineMarkersTest> {
             model("scratch/lineMarker", testMethod = "doScratchTest", pattern = KT_OR_KTS)
         }
-
-        testClass<AbstractFirMultiModuleResolveTest> {
-            model("fir/multiModule", recursive = false, extension = null)
-        }
-
-        testClass<AbstractFirLazyResolveTest> {
-            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
-        }
     }
 
     testGroup("idea/idea-maven/test", "idea/idea-maven/testData") {

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.183

@@ -831,6 +831,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model("scratch", extension = "kts", testMethod = "doScratchCompilingTest", testClassName = "ScratchCompiling", recursive = false)
             model("scratch", extension = "kts", testMethod = "doScratchReplTest", testClassName = "ScratchRepl", recursive = false)

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as34

@@ -819,6 +819,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model("scratch", extension = "kts", testMethod = "doScratchCompilingTest", testClassName = "ScratchCompiling", recursive = false)
             model("scratch", extension = "kts", testMethod = "doScratchReplTest", testClassName = "ScratchRepl", recursive = false)

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35

@@ -819,6 +819,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model("scratch", extension = "kts", testMethod = "doScratchCompilingTest", testClassName = "ScratchCompiling", recursive = false)
             model("scratch", extension = "kts", testMethod = "doScratchReplTest", testClassName = "ScratchRepl", recursive = false)

generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as36

@@ -819,6 +819,16 @@ fun main(args: Array<String>) {
             model("slicer/inflow", singleClass = true)
         }
 
+        testClass<AbstractFirMultiModuleResolveTest> {
+            model("fir/multiModule", recursive = false, extension = null)
+        }
+
+        testClass<AbstractFirLazyResolveTest> {
+            model("fir/lazyResolve", extension = "test", singleClass = true, filenameStartsLowerCase = true)
+        }
+    }
+
+    testGroup("idea/scripting-support/test", "idea/scripting-support/testData") {
         testClass<AbstractScratchRunActionTest> {
             model("scratch", extension = "kts", testMethod = "doScratchCompilingTest", testClassName = "ScratchCompiling", recursive = false)
             model("scratch", extension = "kts", testMethod = "doScratchReplTest", testClassName = "ScratchRepl", recursive = false)