From 9ee60e4648e96b1976dada0710364be7db897371 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 17 Feb 2023 11:46:46 +0200 Subject: [PATCH] [Build] Exclude FIR codegen tests with PSI mode from aggregate test suite Also add nightly configuration for them --- build.gradle.kts | 6 +++++- compiler/fir/fir2ir/build.gradle.kts | 22 ++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 076b784b0f1..554c70e6eba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -682,7 +682,11 @@ tasks { dependsOn(":compiler:fir:raw-fir:light-tree2fir:test") dependsOn(":compiler:fir:analysis-tests:test") dependsOn(":compiler:fir:analysis-tests:legacy-fir-tests:test") - dependsOn(":compiler:fir:fir2ir:test") + dependsOn(":compiler:fir:fir2ir:aggregateTests") + } + + register("nightlyFirCompilerTest") { + dependsOn(":compiler:fir:fir2ir:nightlyTests") } register("compilerFrontendVisualizerTest") { diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts index 50c088b3670..3582e45b076 100644 --- a/compiler/fir/fir2ir/build.gradle.kts +++ b/compiler/fir/fir2ir/build.gradle.kts @@ -73,10 +73,28 @@ if (kotlinBuildProperties.isInJpsBuildIdeaSync) { } } -projectTest(jUnitMode = JUnitMode.JUnit5) { +fun Test.configure(configureJUnit: JUnitPlatformOptions.() -> Unit = {}) { dependsOn(":dist") workingDir = rootDir - useJUnitPlatform() + useJUnitPlatform { + configureJUnit() + } +} + +projectTest(jUnitMode = JUnitMode.JUnit5) { + configure() +} + +projectTest("aggregateTests", jUnitMode = JUnitMode.JUnit5) { + configure { + excludeTags("FirPsiCodegenTest") + } +} + +projectTest("nightlyTests", jUnitMode = JUnitMode.JUnit5) { + configure { + includeTags("FirPsiCodegenTest") + } } testsJar()