azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS IR] Manage cache root dir from IC cache updater

Browse Source 
- pass cache root directory instead of dir list
 - manage klib cache dirs from cache updater
This commit is contained in:
Alexander Korepanov
2022-11-15 21:08:29 +01:00
committed by Space Team
parent c7589245c4
commit ec6a7094e6
5 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/incremental/AbstractInvalidationTest.kt
+1 -8
View File
@@ -92,10 +92,6 @@ abstract class AbstractInvalidationTest : KotlinTestWithEnvironment() {
return File(File(buildDir, moduleName), "$moduleName.klib")
}
private fun resolveModuleCache(moduleName: String, buildDir: File): File {
return File(File(buildDir, moduleName), "cache")
}
private fun createConfiguration(moduleName: String, language: List<String>): CompilerConfiguration {
val copy = environment.configuration.copy()
copy.put(CommonConfigurationKeys.MODULE_NAME, moduleName)
@@ -127,7 +123,6 @@ abstract class AbstractInvalidationTest : KotlinTestWithEnvironment() {
private inner class TestStepInfo(
val moduleName: String,
val modulePath: String,
val icCacheDir: String,
val expectedFileStats: Map<String, Set<String>>
)
@@ -157,7 +152,6 @@ abstract class AbstractInvalidationTest : KotlinTestWithEnvironment() {
return TestStepInfo(
module.safeModuleName,
outputKlibFile.canonicalPath,
resolveModuleCache(module, buildDir).canonicalPath,
expectedFileStats
)
}
@@ -229,7 +223,6 @@ abstract class AbstractInvalidationTest : KotlinTestWithEnvironment() {
}
fun execute() {
val stdlibCacheDir = resolveModuleCache(STDLIB_ALIAS, buildDir).canonicalPath
for (projStep in projectInfo.steps) {
val testInfo = projStep.order.map { setupTestStep(projStep, it) }
@@ -237,7 +230,7 @@ abstract class AbstractInvalidationTest : KotlinTestWithEnvironment() {
val cacheUpdater = CacheUpdater(
mainModule = testInfo.last().modulePath,
allModules = testInfo.mapTo(mutableListOf(STDLIB_KLIB)) { it.modulePath },
icCachePaths = testInfo.mapTo(mutableListOf(stdlibCacheDir)) { it.icCacheDir },
icCacheRootDir = buildDir.resolve("incremental-cache").absolutePath,
compilerConfiguration = configuration,
irFactory = { IrFactoryImplForJsIC(WholeWorldStageController()) },
mainArguments = null,
js/js.tests/test/org/jetbrains/kotlin/js/test/ir/AbstractJsKLibABITestCase.kt
+1 -3
View File
@@ -189,13 +189,11 @@ abstract class AbstractJsKLibABITestCase : KtUsefulTestCase() {
mainModuleKlibFile: File,
allDependencies: KlibABITestUtils.Dependencies
): CompilationOutputs {
fun cacheDir(library: File): File = buildDir.resolve("libs-cache").resolve(library.name).apply { mkdirs() }
// TODO: what about friend dependencies?
val cacheUpdater = CacheUpdater(
mainModule = mainModuleKlibFile.absolutePath,
allModules = allDependencies.regularDependencies.map { it.path },
icCachePaths = allDependencies.regularDependencies.map { cacheDir(it).path },
icCacheRootDir = buildDir.resolve("libs-cache").absolutePath,
compilerConfiguration = configuration,
irFactory = { IrFactoryImplForJsIC(WholeWorldStageController()) },
mainArguments = null,