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

[Tests] Port FilePathsInKlibTest to K2 ^KT-64452

Browse Source 
Used frontend changed for K2
It turned out test was compiling only one source file (a.kt). Test adjusted, so all three source files(a.kt, b/c.kt, c/d/e.kt) are now compiled into klib, so more usecases are tested
^KT-64452 Fixed

Merge-request: KT-MR-14700
Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
This commit is contained in:
Vladimir Sukharev
2024-03-07 10:49:07 +00:00
committed by Space Team
parent 16d53a0e34
commit 1ad0872958
1 changed files with 28 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/klib/FilePathsInKlibTest.kt
+28 -92
View File
@@ -5,25 +5,14 @@
package org.jetbrains.kotlin.klib
import com.intellij.openapi.vfs.StandardFileSystems
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.backend.common.CommonKLibResolver
import org.jetbrains.kotlin.backend.common.serialization.codedInputStream
import org.jetbrains.kotlin.backend.common.serialization.proto.IrFile
import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport
import org.jetbrains.kotlin.cli.js.klib.generateIrForKlibSerialization
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.cli.js.K2JsIrCompiler
import org.jetbrains.kotlin.codegen.CodegenTestCase
import org.jetbrains.kotlin.config.CommonConfigurationKeys
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.diagnostics.DiagnosticReporterFactory
import org.jetbrains.kotlin.incremental.md5
import org.jetbrains.kotlin.ir.backend.js.*
import org.jetbrains.kotlin.ir.declarations.impl.IrFactoryImpl
import org.jetbrains.kotlin.protobuf.ExtensionRegistryLite
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.test.CompilerTestUtil
import org.jetbrains.kotlin.test.util.KtTestUtil
import org.jetbrains.kotlin.util.DummyLogger
import java.io.File
@@ -36,63 +25,8 @@ class FilePathsInKlibTest : CodegenTestCase() {
private const val testDataFile = "compiler/testData/ir/klibLayout/multiFiles.kt"
}
private fun loadKtFiles(directory: File): List<KtFile> {
val psiManager = PsiManager.getInstance(myEnvironment.project)
val fileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL)
val vDirectory = fileSystem.findFileByPath(directory.canonicalPath) ?: error("File not found: $directory")
return psiManager.findDirectory(vDirectory)?.files?.map { it as KtFile } ?: error("Cannot load KtFiles")
}
private val runtimeKlibPath = "libraries/stdlib/build/classes/kotlin/js/main"
private fun analyseKtFiles(configuration: CompilerConfiguration, ktFiles: List<KtFile>): ModulesStructure {
return prepareAnalyzedSourceModule(
myEnvironment.project,
ktFiles,
configuration,
listOf(runtimeKlibPath),
emptyList(),
AnalyzerWithCompilerReport(configuration),
)
}
private fun produceKlib(module: ModulesStructure, destination: File) {
// TODO: improve API for generateIrForKlibSerialization and related functionality and remove code duplication here and in similar places in the code
val sourceFiles = (module.mainModule as MainModule.SourceFiles).files
val icData = module.compilerConfiguration.incrementalDataProvider?.getSerializedData(sourceFiles) ?: emptyList()
val (moduleFragment, _) = generateIrForKlibSerialization(
module.project,
sourceFiles,
module.compilerConfiguration,
module.jsFrontEndResult.jsAnalysisResult,
sortDependencies(module.moduleDependencies),
icData,
IrFactoryImpl,
verifySignatures = true
) {
module.getModuleDescriptor(it)
}
val diagnosticReporter = DiagnosticReporterFactory.createPendingReporter()
generateKLib(
module,
outputKlibPath = destination.path,
nopack = false,
jsOutputName = MODULE_NAME,
icData = icData,
moduleFragment = moduleFragment,
diagnosticReporter = diagnosticReporter,
)
}
private fun setupEnvironment(): CompilerConfiguration {
val configuration = CompilerConfiguration()
myEnvironment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JS_CONFIG_FILES)
configuration.put(CommonConfigurationKeys.MODULE_NAME, MODULE_NAME)
return configuration
}
private fun File.md5(): Long = readBytes().md5()
private fun File.loadKlibFilePaths(): List<String> {
@@ -121,17 +55,23 @@ class FilePathsInKlibTest : CodegenTestCase() {
return createTestFilesFromFile(file, expectedText)
}
private fun compileKlib(testFiles: List<TestFile>, configuration: CompilerConfiguration, workingDir: File): File {
private fun compileKlib(testFiles: List<TestFile>, extraArgs: List<String>, workingDir: File): File {
for (testFile in testFiles) {
val file = File(workingDir, testFile.name).also { it.parentFile.let { p -> if (!p.exists()) p.mkdirs() } }
file.writeText(testFile.content)
}
val ktFiles = loadKtFiles(workingDir)
val module = analyseKtFiles(configuration, ktFiles)
val sourceFiles = walkKtFiles(workingDir)
val artifact = File(workingDir, "$MODULE_NAME.klib")
produceKlib(module, artifact)
CompilerTestUtil.executeCompilerAssertSuccessful(
K2JsIrCompiler(),
sourceFiles + extraArgs + listOf(
"-Xir-produce-klib-file",
"-ir-output-dir", artifact.parentFile.absolutePath,
"-ir-output-name", MODULE_NAME,
"-libraries", runtimeKlibPath,
)
)
return artifact
}
@@ -140,12 +80,10 @@ class FilePathsInKlibTest : CodegenTestCase() {
withTempDir { dirA ->
withTempDir { dirB ->
val testFiles = createTestFiles()
val configuration = setupEnvironment()
val extraArgs = listOf("-Xklib-relative-path-base=${dirA.canonicalPath},${dirB.canonicalPath}")
configuration.put(CommonConfigurationKeys.KLIB_RELATIVE_PATH_BASES, listOf(dirA.canonicalPath, dirB.canonicalPath))
val moduleA = compileKlib(testFiles, configuration, dirA)
val moduleB = compileKlib(testFiles, configuration, dirB)
val moduleA = compileKlib(testFiles, extraArgs, dirA)
val moduleB = compileKlib(testFiles, extraArgs, dirB)
assertEquals(moduleA.md5(), moduleB.md5())
}
@@ -155,13 +93,11 @@ class FilePathsInKlibTest : CodegenTestCase() {
fun testRelativePaths() {
withTempDir { testTempDir ->
val testFiles = createTestFiles()
val configuration = setupEnvironment()
val extraArgs = listOf("-Xklib-relative-path-base=${testTempDir.canonicalPath}")
configuration.put(CommonConfigurationKeys.KLIB_RELATIVE_PATH_BASES, listOf(testTempDir.canonicalPath))
val artifact = compileKlib(testFiles, configuration, testTempDir)
val artifact = compileKlib(testFiles, extraArgs, testTempDir)
val modulePaths = artifact.loadKlibFilePaths().map { it.replace("/", File.separator) }
val dirPaths = testTempDir.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.relativeTo(testTempDir).path }
val dirPaths = walkKtFiles(testTempDir) { it.relativeTo(testTempDir).path }
assertSameElements(modulePaths, dirPaths)
}
@@ -170,13 +106,11 @@ class FilePathsInKlibTest : CodegenTestCase() {
fun testAbsoluteNormalizedPath() {
withTempDir { testTempDir ->
val testFiles = createTestFiles()
val extraArgs = listOf("-Xklib-normalize-absolute-path")
val configuration = setupEnvironment()
configuration.put(CommonConfigurationKeys.KLIB_NORMALIZE_ABSOLUTE_PATH, true)
val artifact = compileKlib(testFiles, configuration, testTempDir)
val artifact = compileKlib(testFiles, extraArgs, testTempDir)
val modulePaths = artifact.loadKlibFilePaths().map { it.replace("/", File.separator) }
val dirCanonicalPaths = testTempDir.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.canonicalPath }
val dirCanonicalPaths = walkKtFiles(testTempDir)
assertSameElements(modulePaths, dirCanonicalPaths)
}
@@ -191,12 +125,11 @@ class FilePathsInKlibTest : CodegenTestCase() {
val dummyFile = dummyPath.toFile().also { assert(it.isDirectory) }
try {
val configuration = setupEnvironment()
configuration.put(CommonConfigurationKeys.KLIB_RELATIVE_PATH_BASES, listOf(dummyFile.canonicalPath))
val extraArgs = listOf("-Xklib-relative-path-base=${dummyFile.canonicalPath}")
val artifact = compileKlib(testFiles, configuration, testTempDir)
val artifact = compileKlib(testFiles, extraArgs, testTempDir)
val modulePaths = artifact.loadKlibFilePaths()
val dirCanonicalPaths = testTempDir.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.canonicalPath }
val dirCanonicalPaths = walkKtFiles(testTempDir)
assertSameElements(modulePaths.map { it.normalizePath() }, dirCanonicalPaths.map { it.normalizePath() })
} finally {
@@ -205,6 +138,9 @@ class FilePathsInKlibTest : CodegenTestCase() {
}
}
private inline fun walkKtFiles(dir: File, crossinline convert: (File) -> String = { it.canonicalPath }): List<String> =
dir.walk().filter { it.name.endsWith(".kt") }.map { convert(it) }.toList()
private fun withTempDir(f: (File) -> Unit) {
val workingPath: Path = kotlin.io.path.createTempDirectory()
val workingDirFile = workingPath.toFile().also { assert(it.isDirectory) }