introduce lightTree subfolder to exclude tests for PSI parser

It will temporarily exclude tests because of KT-29222
JetBrains · Dec 9, 2024 · cf6413e · cf6413e
1 parent f02141e
commit cf6413e
Show file tree

Hide file tree

Showing 8 changed files with 1,495 additions and 1,480 deletions.
diff --git a/...el/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/...el/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
diff --git a/...vel/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java b/...vel/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFirTestdataTestGenerated.java
diff --git a/...c/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/...c/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
diff --git a/...ic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java b/...ic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFirTestDataTestGenerated.java
diff --git a/...sts-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/...sts-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
diff --git a/...piler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/...piler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -303,7 +303,7 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
             }
 
             testClass<AbstractFirPsiBlackBoxCodegenTest> {
-                model("codegen/box", excludeDirs = k1BoxTestDir)
+                model("codegen/box", excludeDirs = k1BoxTestDir, excludeDirsRecursively = listOf("lightTree"))
             }
 
             testClass<AbstractFirLightTreeBlackBoxCodegenTest>("FirLightTreeBlackBoxModernJdkCodegenTestGenerated") {
@@ -423,15 +423,20 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
                     true -> TestGeneratorUtil.KT_OR_KTS_WITHOUT_DOTS_IN_NAME
                     false -> TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME
                 }
+                val excludeLightTreeForPsi =
+                    if (baseTestClassName == AbstractFirPsiDiagnosticTest::class.java.name) listOf("lightTree") else emptyList()
+
                 model(
                     "resolve",
                     pattern = pattern,
+                    excludeDirsRecursively = excludeLightTreeForPsi,
                     skipSpecificFile = skipSpecificFileForFirDiagnosticTest(onlyTypealiases),
                     skipTestAllFilesCheck = onlyTypealiases
                 )
                 model(
                     "resolveWithStdlib",
                     pattern = pattern,
+                    excludeDirsRecursively = excludeLightTreeForPsi,
                     skipSpecificFile = skipSpecificFileForFirDiagnosticTest(onlyTypealiases),
                     skipTestAllFilesCheck = onlyTypealiases
                 )
@@ -441,6 +446,7 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
                 model(
                     "resolveFreezesIDE",
                     pattern = """^(.+)\.(nkt)$""",
+                    excludeDirsRecursively = excludeLightTreeForPsi,
                     skipSpecificFile = skipSpecificFileForFirDiagnosticTest(onlyTypealiases),
                     skipTestAllFilesCheck = onlyTypealiases
                 )
@@ -508,7 +514,11 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
             )
 
             testClass<AbstractTieredBackendJvmPsiTest>(
-                init = configureTierModelsForK1AlongsideDiagnosticTestsStating(TestTierLabel.BACKEND, allowKts = true),
+                init = configureTierModelsForK1AlongsideDiagnosticTestsStating(
+                    TestTierLabel.BACKEND,
+                    allowKts = true,
+                    excludeDirsRecursively = listOf("lightTree")
+                ),
             )
         }
     }

diff --git a/...mpiler-generator/tests/org/jetbrains/kotlin/test/generators/TieredConfigurationHelpers.kt b/...mpiler-generator/tests/org/jetbrains/kotlin/test/generators/TieredConfigurationHelpers.kt
@@ -38,6 +38,7 @@ fun configureTierModelsForDeclaredAs(
     vararg tiers: TestTierLabel,
     relativeRootPaths: List<String>,
     excludeDirs: List<String>,
+    excludeDirsRecursively: List<String> = emptyList(),
     extension: String? = "kt",
     pattern: String = if (extension == null) """^([^\.]+)$""" else "^(.+)\\.$extension\$",
     excludedPattern: String? = null,
@@ -52,6 +53,7 @@ fun configureTierModelsForDeclaredAs(
             extension = extension,
             pattern = pattern,
             excludedPattern = excludedPattern,
+            excludeDirsRecursively = excludeDirsRecursively,
         )
     }
 }
@@ -62,6 +64,7 @@ fun configureTierModelsForDeclaredAs(
 fun configureTierModelsForK1AlongsideDiagnosticTestsStating(
     vararg tiers: TestTierLabel,
     allowKts: Boolean,
+    excludeDirsRecursively: List<String> = emptyList(),
 ): TestGroup.TestClass.() -> Unit =
     configureTierModelsForDeclaredAs(
         *tiers,
@@ -80,4 +83,5 @@ fun configureTierModelsForK1AlongsideDiagnosticTestsStating(
             else -> "^(.*)\\.(kt|nkt)$"
         },
         excludedPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN,
+        excludeDirsRecursively = excludeDirsRecursively,
     )
diff --git a/...sis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt b/...sis-api-generator/tests/org/jetbrains/kotlin/generators/tests/analysis/api/firLowLevel.kt
@@ -317,8 +317,8 @@ internal fun TestGroupSuite.generateFirLowLevelApiTests() {
         "compiler/fir/analysis-tests/testData",
     ) {
         fun TestGroup.TestClass.modelInit() {
-            model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
-            model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME)
+            model("resolve", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, excludeDirsRecursively = listOf("lightTree"))
+            model("resolveWithStdlib", pattern = TestGeneratorUtil.KT_WITHOUT_DOTS_IN_NAME, excludeDirsRecursively = listOf("lightTree"))
         }
 
         testClass<AbstractDiagnosticCompilerTestDataTest>(suiteTestClassName = "DiagnosticCompilerTestFirTestdataTestGenerated") {
@@ -380,6 +380,7 @@ internal fun TestGroupSuite.generateFirLowLevelApiTests() {
                 "diagnostics/tests",
                 excludedPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN,
                 pattern = KT_OR_KTS,
+                excludeDirsRecursively = listOf("lightTree"),
             )
             model(
                 "diagnostics/testsWithStdLib",