From d9b4e24b292d59cf4d1bc6aa858053c2393b30a6 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 16 Jun 2020 12:21:46 +0300 Subject: [PATCH] Exclude JS API dumps from FIR consistency tests --- .../fir/builder/RawFirBuilderTotalKotlinTestCase.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt b/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt index 96d7fbf1aea..54dc0390210 100644 --- a/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt +++ b/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/RawFirBuilderTotalKotlinTestCase.kt @@ -20,7 +20,6 @@ import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.visitors.FirVisitorVoid import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.getStartOffsetIn import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.test.JUnit3RunnerWithInners @@ -52,7 +51,8 @@ class RawFirBuilderTotalKotlinTestCase : AbstractRawFirBuilderTestCase() { println("BASE PATH: $testDataPath") for (file in root.walkTopDown()) { if (file.isDirectory) continue - if (file.path.contains("testData") || file.path.contains("resources")) continue + val path = file.path + if ("testData" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue if (file.extension != "kt") continue try { val ktFile = createKtFile(file.toRelativeString(root)) @@ -175,7 +175,8 @@ class RawFirBuilderTotalKotlinTestCase : AbstractRawFirBuilderTestCase() { val root = File(testDataPath) for (file in root.walkTopDown()) { if (file.isDirectory) continue - if (file.path.contains("testData") || file.path.contains("resources")) continue + val path = file.path + if ("testData" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue if (file.extension != "kt") continue val ktFile = createKtFile(file.toRelativeString(root)) val firFile = ktFile.toFirFile(stubMode = false) @@ -201,7 +202,8 @@ class RawFirBuilderTotalKotlinTestCase : AbstractRawFirBuilderTestCase() { var counter = 0 for (file in root.walkTopDown()) { if (file.isDirectory) continue - if (file.path.contains("testData") || file.path.contains("resources")) continue + val path = file.path + if ("testData" in path || "resources" in path || "api/js" in path.replace('\\', '/')) continue if (file.extension != "kt") continue val ktFile = createKtFile(file.toRelativeString(root)) val firFile: FirFile = ktFile.toFirFile(stubMode = false)