From d7224ad63e531c8abd61e0ee477c52de520e0615 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Fri, 4 Dec 2020 13:28:25 +0300
Subject: [PATCH] [Build] Add generating and running new compiler tests to
 gradle

---
 .idea/runConfigurations/Generate_Compiler_Tests.xml            | 3 ++-
 build.gradle.kts                                               | 2 ++
 compiler/tests-common-new/build.gradle.kts                     | 2 ++
 plugins/pill/generate-all-tests/build.gradle.kts               | 3 ++-
 .../test/org/jetbrains/kotlin/pill/generateAllTests/Main.java  | 2 ++
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations/Generate_Compiler_Tests.xml b/.idea/runConfigurations/Generate_Compiler_Tests.xml
index 6c72d3e9721..44a573c3fb5 100644
--- a/.idea/runConfigurations/Generate_Compiler_Tests.xml
+++ b/.idea/runConfigurations/Generate_Compiler_Tests.xml
@@ -15,6 +15,7 @@
           <option value=":compiler:tests-against-klib:generateTests" />
           <option value=":js:js.tests:generateTests" />
           <option value=":core:descriptors.runtime:generateTests" />
+          <option value=":compiler:tests-common-new:generateTests" />
         </list>
       </option>
       <option name="vmOptions" value="" />
@@ -22,4 +23,4 @@
     <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <method />
   </configuration>
-</component>
\ No newline at end of file
+</component>
diff --git a/build.gradle.kts b/build.gradle.kts
index b3afa6c8093..a0b9592cbf6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -630,6 +630,7 @@ tasks {
         dependsOn("dist")
         dependsOn(
             ":compiler:test",
+            ":compiler:tests-common-new:test",
             ":compiler:container:test",
             ":compiler:tests-java8:test",
             ":compiler:tests-spec:test",
@@ -870,6 +871,7 @@ tasks {
             ":idea:idea-gradle:test",
             ":idea:test",
             ":compiler:test",
+            ":compiler:container:test",
             ":js:js.tests:test"
         )
 
diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts
index b037e357a9c..c49bba60ea1 100644
--- a/compiler/tests-common-new/build.gradle.kts
+++ b/compiler/tests-common-new/build.gradle.kts
@@ -64,3 +64,5 @@ projectTest(parallel = true) {
 }
 
 testsJar()
+
+val generateTests by generator("org.jetbrains.kotlin.test.generators.GenerateNewCompilerTestsKt")
diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts
index 655fc3616df..b572a5b6367 100644
--- a/plugins/pill/generate-all-tests/build.gradle.kts
+++ b/plugins/pill/generate-all-tests/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
 val depenencyProjects = arrayOf(
     ":generators",
     ":compiler",
+    ":compiler:tests-common-new",
     ":js:js.tests",
     ":compiler:tests-java8",
     ":core:descriptors.runtime"
@@ -24,4 +25,4 @@ dependencies {
 sourceSets {
     "main" { }
     "test" { projectDefault() }
-}
\ No newline at end of file
+}
diff --git a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
index d714adf624e..287b3fe3dd3 100644
--- a/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
+++ b/plugins/pill/generate-all-tests/test/org/jetbrains/kotlin/pill/generateAllTests/Main.java
@@ -7,12 +7,14 @@ package org.jetbrains.kotlin.pill.generateAllTests;
 
 import org.jetbrains.kotlin.generators.tests.*;
 import org.jetbrains.kotlin.generators.InconsistencyChecker;
+import org.jetbrains.kotlin.test.generators.GenerateNewCompilerTestsKt;
 
 import java.util.List;
 
 public class Main {
     public static void main(String[] args) {
         GenerateCompilerTestsKt.main(args);
+        GenerateNewCompilerTestsKt.main(args);
         GenerateTestsKt.main(args);
         GenerateJsTestsKt.main(args);
         GenerateJava8TestsKt.main(args);