Skip to content

Commit 2e72b6a

Browse files
CristianGMSpace Team
authored andcommitted
Make :compiler:fir:fir2ir:test cacheable
^KTI-2586
1 parent 03bbc6d commit 2e72b6a

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

compiler/fir/fir2ir/build.gradle.kts

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
id("jps-compatible")
44
id("java-test-fixtures")
55
id("project-tests-convention")
6+
id("test-inputs-check")
67
}
78

89
dependencies {
@@ -64,14 +65,18 @@ sourceSets {
6465
}
6566

6667
fun Test.configure(configureJUnit: JUnitPlatformOptions.() -> Unit = {}) {
67-
dependsOn(":dist")
68-
workingDir = rootDir
6968
useJUnitPlatform {
7069
configureJUnit()
7170
}
7271
}
7372

7473
projectTests {
74+
testData(project(":compiler").isolated, "testData/codegen")
75+
testData(project(":compiler").isolated, "testData/diagnostics")
76+
testData(project(":compiler").isolated, "testData/ir")
77+
testData(project(":compiler").isolated, "testData/klib")
78+
testData(project(":compiler").isolated, "testData/debug")
79+
testData(project(":compiler:tests-spec").isolated, "testData/codegen")
7580
testTask(
7681
jUnitMode = JUnitMode.JUnit5,
7782
defineJDKEnvVariables = listOf(JdkMajorVersion.JDK_1_8, JdkMajorVersion.JDK_11_0, JdkMajorVersion.JDK_17_0, JdkMajorVersion.JDK_21_0),
@@ -95,6 +100,15 @@ projectTests {
95100
testGenerator("org.jetbrains.kotlin.test.TestGeneratorForFir2IrTestsKt")
96101

97102
withJvmStdlibAndReflect()
103+
withScriptRuntime()
104+
withMockJdkAnnotationsJar()
105+
withTestJar()
106+
withScriptingPlugin()
107+
withMockJdkRuntime()
108+
withStdlibCommon()
109+
withAnnotations()
110+
withThirdPartyAnnotations()
111+
withThirdPartyJsr305()
98112
}
99113

100114
testsJarToBeUsedAlongWithFixtures()

compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/runners/codegen/AbstractFirScriptCodegenTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
4141
import org.jetbrains.kotlin.test.services.TestServices
4242
import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigurator
4343
import org.jetbrains.kotlin.test.services.configuration.JvmEnvironmentConfigurator
44-
import org.jetbrains.kotlin.utils.PathUtil
45-
import java.io.File
44+
import org.jetbrains.kotlin.test.services.standardLibrariesPathProvider
4645
import java.net.URLClassLoader
4746

4847
open class AbstractFirScriptAndReplCodegenTest(val frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>> = ::FirFrontendFacade) :
@@ -177,8 +176,7 @@ class FirJvmScriptRunChecker(testServices: TestServices) : JvmBinaryArtifactHand
177176

178177
class ScriptingPluginEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) {
179178
override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {
180-
val libPath = PathUtil.kotlinPathsForCompiler.libPath
181-
val pluginClasspath = PathUtil.KOTLIN_SCRIPTING_PLUGIN_CLASSPATH_JARS.map { File(libPath, it) }
179+
val pluginClasspath = testServices.standardLibrariesPathProvider.scriptingPluginFilesForTests()
182180
val pluginClassLoader = URLClassLoader(pluginClasspath.map { it.toURI().toURL() }.toTypedArray(), this::class.java.classLoader)
183181

184182
val pluginRegistrarClass = pluginClassLoader.loadClass(CLICompiler.SCRIPT_PLUGIN_REGISTRAR_NAME)

0 commit comments

Comments
 (0)