From 7d277b907fbfd0dbae0f7a165c6fe7630b1ab3b5 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 29 Sep 2020 10:44:33 +0300 Subject: [PATCH] [FIR] Add new backend tests to "[JPS] Run fast FIR tests" configuration --- gradle/jps.gradle.kts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index 9090c72d642..bf2bd488a45 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -63,9 +63,18 @@ fun setupGenerateAllTestsRunConfiguration() { // Needed because of idea.ext plugin doesn't allow to set TEST_SEARCH_SCOPE = moduleWithDependencies fun setupFirRunConfiguration() { + val tests = listOf( + "org\\.jetbrains\\.kotlin\\.fir((?!\\.lightTree\\.benchmark)(\\.\\w+)*)\\.((?!(TreesCompareTest|TotalKotlinTest|RawFirBuilderTotalKotlinTestCase))\\w+)", + "org\\.jetbrains\\.kotlin\\.codegen\\.ir\\.FirBlackBoxCodegenTestGenerated", + "org\\.jetbrains\\.kotlin\\.spec\\.checkers\\.FirDiagnosticsTestSpecGenerated", + "org\\.jetbrains\\.kotlin\\.codegen\\.ir\\.FirBytecodeTextTestGenerated", + "org\\.jetbrains\\.kotlin\\.codegen\\.ir\\.FirBlackBoxAgainstJavaCodegenTestGenerated", + "org\\.jetbrains\\.kotlin\\.codegen\\.ir\\.FirBlackBoxInlineCodegenTestGenerated" + ) + val junit = JUnit("_stub").apply { configureForKotlin("2048m") } junit.moduleName = "kotlin.compiler.tests-spec.test" - junit.pattern = "^(org\\.jetbrains\\.kotlin\\.fir((?!\\.lightTree\\.benchmark)(\\.\\w+)*)\\.((?!(TreesCompareTest|TotalKotlinTest|RawFirBuilderTotalKotlinTestCase))\\w+)|org\\.jetbrains\\.kotlin\\.codegen\\.ir\\.FirBlackBoxCodegenTestGenerated|org\\.jetbrains\\.kotlin\\.spec\\.checkers\\.FirDiagnosticsTestSpecGenerated)\$" + junit.pattern = tests.joinToString(separator = "|", prefix = "^(", postfix = ")\$") junit.vmParameters = junit.vmParameters.replace(rootDir.absolutePath, "\$PROJECT_DIR\$") junit.workingDirectory = junit.workingDirectory.replace(rootDir.absolutePath, "\$PROJECT_DIR\$")