From 7c4e43938beaee54ecd3800e35e0130b1e273d01 Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Sun, 7 Jan 2024 13:34:22 +0100 Subject: [PATCH] [Tests] Add custom JVM target tests for K2 ^KT-59630 Fixed --- compiler/tests-different-jdk/build.gradle.kts | 1 + .../kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/compiler/tests-different-jdk/build.gradle.kts b/compiler/tests-different-jdk/build.gradle.kts index 11c53914206..22441b785e3 100644 --- a/compiler/tests-different-jdk/build.gradle.kts +++ b/compiler/tests-different-jdk/build.gradle.kts @@ -9,6 +9,7 @@ dependencies { testApi(projectTests(":compiler:test-infrastructure-utils")) testApi(projectTests(":compiler:tests-compiler-utils")) testApi(projectTests(":compiler:tests-common-new")) + testApi(projectTests(":compiler:fir:fir2ir")) testApi(platform(libs.junit.bom)) testImplementation(libs.junit.jupiter.api) diff --git a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt index a868a1dd673..0776ff4d9ed 100644 --- a/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt +++ b/compiler/tests-different-jdk/tests/org/jetbrains/kotlin/codegen/jdk/CustomJvmTargetOnJvmBaseTest.kt @@ -29,6 +29,14 @@ import org.junit.runner.RunWith IrBlackBoxInlineCodegenWithBytecodeInlinerTestGenerated::class, IrCompileKotlinAgainstInlineKotlinTestGenerated::class, + FirLightTreeBlackBoxCodegenTestGenerated::class, + FirLightTreeBlackBoxInlineCodegenWithBytecodeInlinerTestGenerated::class, + FirLightTreeSerializeCompileKotlinAgainstInlineKotlinTestGenerated::class, + + FirPsiBlackBoxCodegenTestGenerated::class, + FirPsiBlackBoxInlineCodegenWithBytecodeInlinerTestGenerated::class, + FirPsiSerializeCompileKotlinAgainstInlineKotlinTestGenerated::class, + CoreJrtFsTest::class ) @IncludeClassNamePatterns(".*Test.*Generated")