From 118324445530a9382a1cc8542ae7e7d3c72da72c Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 14 Nov 2023 09:45:55 +0100 Subject: [PATCH] [tests] Use full paths with the proper extensions to KLIBs in `LibraryProvider` ^KT-61098 --- .../kotlin/test/frontend/classic/ClassicFrontendFacade.kt | 2 +- .../kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt | 3 +-- .../kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt | 3 +-- .../kotlin/konan/test/Fir2IrNativeResultsConverter.kt | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt index d58507a7675..1ea7752c67f 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/classic/ClassicFrontendFacade.kt @@ -288,7 +288,7 @@ class ClassicFrontendFacade( val dependencies = mutableListOf() return resolvedLibraries.map { resolvedLibrary -> - testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryName) { + testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) { val storageManager = LockBasedStorageManager("ModulesStructure") val isBuiltIns = resolvedLibrary.library.unresolvedDependencies.isEmpty() diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt index e5bd90d8805..596ffa4d434 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrJsResultsConverter.kt @@ -199,8 +199,7 @@ private fun loadResolvedLibraries( val dependencies = mutableListOf() 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.libraryName) { + testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) { // TODO: check safety of the approach of creating a separate storage manager per library val storageManager = LockBasedStorageManager("ModulesStructure") diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt index f2089b5fbe6..f03beba86bf 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/Fir2IrWasmResultsConverter.kt @@ -198,8 +198,7 @@ private fun loadResolvedLibraries( val dependencies = mutableListOf() 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.libraryName) { + testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) { // TODO: check safety of the approach of creating a separate storage manager per library val storageManager = LockBasedStorageManager("ModulesStructure") diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt index f6f3f8186ca..95d433a785a 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/test/Fir2IrNativeResultsConverter.kt @@ -176,8 +176,7 @@ private fun loadResolvedLibraries( val dependencies = mutableListOf() 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.libraryName) { + testServices.libraryProvider.getOrCreateStdlibByPath(resolvedLibrary.library.libraryFile.absolutePath) { // TODO: check safety of the approach of creating a separate storage manager per library val storageManager = LockBasedStorageManager("ModulesStructure")