[test] Exclude "K1-only" from FIR IR text tests and "K2-only" from Classic IR text tests

^KT-60390

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class FirLightTreeJvmIrTextTestGenerated extends AbstractFirLightTreeJvmIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "declarations/multiplatform/k1");
     }
 
     @Nested
@@ -411,7 +411,7 @@ public class FirLightTreeJvmIrTextTestGenerated extends AbstractFirLightTreeJvmI
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "multiplatform/k1");
         }
 
         @Test
@@ -1028,47 +1028,7 @@ public class FirLightTreeJvmIrTextTestGenerated extends AbstractFirLightTreeJvmI
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "k1");
-            }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k1")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K1 {
-                @Test
-                public void testAllFilesPresentInK1() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k1"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
-                }
             }
 
             @Nested

compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class FirPsiJvmIrTextTestGenerated extends AbstractFirPsiJvmIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "declarations/multiplatform/k1");
     }
 
     @Nested
@@ -411,7 +411,7 @@ public class FirPsiJvmIrTextTestGenerated extends AbstractFirPsiJvmIrTextTest {
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "multiplatform/k1");
         }
 
         @Test
@@ -1028,47 +1028,7 @@ public class FirPsiJvmIrTextTestGenerated extends AbstractFirPsiJvmIrTextTest {
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "k1");
-            }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k1")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K1 {
-                @Test
-                public void testAllFilesPresentInK1() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k1"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
-                }
             }
 
             @Nested

compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class ClassicJvmIrTextTestGenerated extends AbstractClassicJvmIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "declarations/multiplatform/k2");
     }
 
     @Nested
@@ -411,7 +411,7 @@ public class ClassicJvmIrTextTestGenerated extends AbstractClassicJvmIrTextTest
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "multiplatform/k2");
         }
 
         @Test
@@ -1028,7 +1028,7 @@ public class ClassicJvmIrTextTestGenerated extends AbstractClassicJvmIrTextTest
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true, "k2");
             }
 
             @Nested
@@ -1070,46 +1070,6 @@ public class ClassicJvmIrTextTestGenerated extends AbstractClassicJvmIrTextTest
                     runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
                 }
             }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k2")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K2 {
-                @Test
-                public void testAllFilesPresentInK2() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectedSealedClass.kt");
-                }
-            }
         }
 
         @Nested

compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt

@@ -124,7 +124,10 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
             }
 
             testClass<AbstractClassicJvmIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k2")
+                )
             }
 
             testClass<AbstractClassicJvmIrSourceRangesTest> {
@@ -376,11 +379,17 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
 
         testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/testData") {
             testClass<AbstractFirLightTreeJvmIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k1")
+                )
             }
 
             testClass<AbstractFirPsiJvmIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k1")
+                )
             }
 
             testClass<AbstractFirLightTreeJvmIrSourceRangesTest> {

js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt

@@ -232,15 +232,24 @@ fun main(args: Array<String>) {
             }
 
             testClass<AbstractClassicJsIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k2")
+                )
             }
 
             testClass<AbstractFirLightTreeJsIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k1")
+                )
             }
 
             testClass<AbstractFirPsiJsIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k1")
+                )
             }
 
             testClass<AbstractFirJsCodegenBoxTest> {

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "declarations/multiplatform/k1");
     }
 
     @Nested
@@ -363,7 +363,7 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrT
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "multiplatform/k1");
         }
 
         @Test
@@ -938,47 +938,7 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrT
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "k1");
-            }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k1")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K1 {
-                @Test
-                public void testAllFilesPresentInK1() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k1"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
-                }
             }
 
             @Nested

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "declarations/multiplatform/k1");
     }
 
     @Nested
@@ -363,7 +363,7 @@ public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest {
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "multiplatform/k1");
         }
 
         @Test
@@ -938,47 +938,7 @@ public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest {
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "k1");
-            }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k1")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K1 {
-                @Test
-                public void testAllFilesPresentInK1() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k1"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
-                }
             }
 
             @Nested

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "declarations/multiplatform/k2");
     }
 
     @Nested
@@ -363,7 +363,7 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "multiplatform/k2");
         }
 
         @Test
@@ -938,7 +938,7 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true, "k2");
             }
 
             @Nested
@@ -980,46 +980,6 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest {
                     runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
                 }
             }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k2")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K2 {
-                @Test
-                public void testAllFilesPresentInK2() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectedSealedClass.kt");
-                }
-            }
         }
 
         @Nested

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class ClassicNativeIrTextTestGenerated extends AbstractClassicNativeIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "declarations/multiplatform/k2");
     }
 
     @Nested
@@ -363,7 +363,7 @@ public class ClassicNativeIrTextTestGenerated extends AbstractClassicNativeIrTex
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "multiplatform/k2");
         }
 
         @Test
@@ -938,7 +938,7 @@ public class ClassicNativeIrTextTestGenerated extends AbstractClassicNativeIrTex
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "k2");
             }
 
             @Nested
@@ -980,46 +980,6 @@ public class ClassicNativeIrTextTestGenerated extends AbstractClassicNativeIrTex
                     runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
                 }
             }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k2")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K2 {
-                @Test
-                public void testAllFilesPresentInK2() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k2"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k2/expectedSealedClass.kt");
-                }
-            }
         }
 
         @Nested

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirLightTreeNativeIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class FirLightTreeNativeIrTextTestGenerated extends AbstractFirLightTreeNativeIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "declarations/multiplatform/k1");
     }
 
     @Nested
@@ -363,7 +363,7 @@ public class FirLightTreeNativeIrTextTestGenerated extends AbstractFirLightTreeN
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "multiplatform/k1");
         }
 
         @Test
@@ -938,47 +938,7 @@ public class FirLightTreeNativeIrTextTestGenerated extends AbstractFirLightTreeN
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "k1");
-            }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k1")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K1 {
-                @Test
-                public void testAllFilesPresentInK1() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k1"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
-                }
             }
 
             @Nested

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirPsiNativeIrTextTestGenerated.java

@@ -22,7 +22,7 @@ import java.util.regex.Pattern;
 public class FirPsiNativeIrTextTestGenerated extends AbstractFirPsiNativeIrTextTest {
     @Test
     public void testAllFilesPresentInIrText() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "declarations/multiplatform/k1");
     }
 
     @Nested
@@ -363,7 +363,7 @@ public class FirPsiNativeIrTextTestGenerated extends AbstractFirPsiNativeIrTextT
     public class Declarations {
         @Test
         public void testAllFilesPresentInDeclarations() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "multiplatform/k1");
         }
 
         @Test
@@ -938,47 +938,7 @@ public class FirPsiNativeIrTextTestGenerated extends AbstractFirPsiNativeIrTextT
         public class Multiplatform {
             @Test
             public void testAllFilesPresentInMultiplatform() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true, "k1");
-            }
-
-            @Nested
-            @TestMetadata("compiler/testData/ir/irText/declarations/multiplatform/k1")
-            @TestDataPath("$PROJECT_ROOT")
-            public class K1 {
-                @Test
-                public void testAllFilesPresentInK1() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform/k1"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                }
-
-                @Test
-                @TestMetadata("expectClassInherited.kt")
-                public void testExpectClassInherited() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt");
-                }
-
-                @Test
-                @TestMetadata("expectIntersectionOverride.kt")
-                public void testExpectIntersectionOverride() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectIntersectionOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("expectMemberInNotExpectClass.kt")
-                public void testExpectMemberInNotExpectClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedEnumClass.kt")
-                public void testExpectedEnumClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt");
-                }
-
-                @Test
-                @TestMetadata("expectedSealedClass.kt")
-                public void testExpectedSealedClass() throws Exception {
-                    runTest("compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt");
-                }
             }
 
             @Nested

native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt

@@ -71,13 +71,22 @@ fun main() {
                 model("codegen/boxInline", targetBackend = TargetBackend.NATIVE)
             }
             testClass<AbstractClassicNativeIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k2")
+                )
             }
             testClass<AbstractFirLightTreeNativeIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k1")
+                )
             }
             testClass<AbstractFirPsiNativeIrTextTest> {
-                model("ir/irText")
+                model(
+                    "ir/irText",
+                    excludeDirs = listOf("declarations/multiplatform/k1")
+                )
             }
         }