From 9138425a3d10eaf79cea1cd8d202f0a5ba6efd37 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Tue, 5 Oct 2021 12:36:32 +0300 Subject: [PATCH] [JS IR] Pass friend dependencies to compiler in test runner --- .../test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt index 9eb5fb63045..44ae27621c5 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt @@ -220,11 +220,16 @@ abstract class BasicIrBoxTest( val runtimeKlibs = if (needsFullIrRuntime) listOf(fullRuntimeKlib, kotlinTestKLib) else listOf(defaultRuntimeKlib) val transitiveLibraries = config.configuration[JSConfigurationKeys.TRANSITIVE_LIBRARIES]!!.map { File(it).name } + val friendsLibraries = (config.configuration[JSConfigurationKeys.FRIEND_PATHS] ?: emptyList()).map { File(it).name } val allKlibPaths = (runtimeKlibs + transitiveLibraries.map { compilationCache[it] ?: error("Can't find compiled module for dependency $it") }).map { File(it).absolutePath }.toMutableList() + val friendPaths = friendsLibraries.map { compilationCache[it] ?: error("Can't find compiled module for friend dep $it") }.map { + File(it).canonicalPath + } + val klibPath = outputFile.canonicalPath.replace("_v5.js", "") val actualOutputFile = outputFile.canonicalPath.let { @@ -241,7 +246,7 @@ abstract class BasicIrBoxTest( filesToCompile, config.configuration, allKlibPaths, - emptyList(), + friendPaths, AnalyzerWithCompilerReport(config.configuration), ) generateKLib( @@ -288,7 +293,7 @@ abstract class BasicIrBoxTest( MainModule.Klib(klibPath), config.configuration, allKlibPaths + klibCannonPath, - emptyList(), + friendPaths, icUseGlobalSignatures = runIcMode, icUseStdlibCache = runIcMode, icCache = emptyMap()