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

[tests] Use full paths with the proper extensions to KLIBs in LibraryProvider

Browse Source 
^KT-61098
This commit is contained in:
Dmitriy Dolovov
2023-11-14 09:45:55 +01:00
committed by Space Team
parent 82b08a813b
commit 1183244455
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt
+1 -1
View File
@@ -288,7 +288,7 @@ class ClassicFrontendFacade(
val dependencies = mutableListOf<ModuleDescriptorImpl>() val dependencies = mutableListOf<ModuleDescriptorImpl>()
return resolvedLibraries.map { resolvedLibrary -> return resolvedLibraries.map { resolvedLibrary ->
testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) { testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) {
val storageManager = LockBasedStorageManager("ModulesStructure") val storageManager = LockBasedStorageManager("ModulesStructure")
val isBuiltIns = resolvedLibrary.library.unresolvedDependencies.isEmpty() val isBuiltIns = resolvedLibrary.library.unresolvedDependencies.isEmpty()
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt
+1 -2
View File
@@ -199,8 +199,7 @@ private fun loadResolvedLibraries(
val dependencies = mutableListOf<ModuleDescriptorImpl>() val dependencies = mutableListOf<ModuleDescriptorImpl>()
return resolvedLibraries.map { resolvedLibrary -> return resolvedLibraries.map { resolvedLibrary ->
// resolvedLibrary.library.libraryName in fact resolves to (modified) file path, which is confising and maybe should be refactored testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) {
testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) {
// TODO: check safety of the approach of creating a separate storage manager per library // TODO: check safety of the approach of creating a separate storage manager per library
val storageManager = LockBasedStorageManager("ModulesStructure") val storageManager = LockBasedStorageManager("ModulesStructure")
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt
+1 -2
View File
@@ -198,8 +198,7 @@ private fun loadResolvedLibraries(
val dependencies = mutableListOf<ModuleDescriptorImpl>() val dependencies = mutableListOf<ModuleDescriptorImpl>()
return resolvedLibraries.map { resolvedLibrary -> return resolvedLibraries.map { resolvedLibrary ->
// resolvedLibrary.library.libraryName in fact resolves to (modified) file path, which is confising and maybe should be refactored testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) {
testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) {
// TODO: check safety of the approach of creating a separate storage manager per library // TODO: check safety of the approach of creating a separate storage manager per library
val storageManager = LockBasedStorageManager("ModulesStructure") val storageManager = LockBasedStorageManager("ModulesStructure")
native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt
+1 -2
View File
@@ -176,8 +176,7 @@ private fun loadResolvedLibraries(
val dependencies = mutableListOf<ModuleDescriptorImpl>() val dependencies = mutableListOf<ModuleDescriptorImpl>()
return resolvedLibraries.map { resolvedLibrary -> return resolvedLibraries.map { resolvedLibrary ->
// resolvedLibrary.library.libraryName in fact resolves to (modified) file path, which is confusing and maybe should be refactored testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) {
testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) {
// TODO: check safety of the approach of creating a separate storage manager per library // TODO: check safety of the approach of creating a separate storage manager per library
val storageManager = LockBasedStorageManager("ModulesStructure") val storageManager = LockBasedStorageManager("ModulesStructure")