[JS] Migrate tests onto IR compiler with outputDir API instead of outputFile
^KT-61117 fixed
This commit is contained in:
committed by
Space Team
parent
e50f6e6bca
commit
08e3cb300a
@@ -343,11 +343,12 @@ class JpsKotlinCompilerRunner {
|
||||
settings: K2JSCompilerArguments,
|
||||
) {
|
||||
with(settings) {
|
||||
noStdlib = true
|
||||
freeArgs = allSourceFiles.map { it.path }.toMutableList()
|
||||
irProduceKlibDir = true
|
||||
irOnly = true
|
||||
commonSources = _commonSources.map { it.path }.toTypedArray()
|
||||
outputFile = _outputFile.path
|
||||
metaInfo = true
|
||||
outputDir = _outputFile.parent
|
||||
moduleName = _outputFile.nameWithoutExtension
|
||||
libraries = _libraries.joinToString(File.pathSeparator)
|
||||
friendModules = _friendModules.joinToString(File.pathSeparator)
|
||||
}
|
||||
|
||||
@@ -22,10 +22,9 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget
|
||||
import org.jetbrains.jps.incremental.storage.BuildDataManager
|
||||
import org.jetbrains.jps.incremental.storage.StorageOwner
|
||||
import org.jetbrains.kotlin.incremental.*
|
||||
import org.jetbrains.kotlin.incremental.storage.FileToPathConverter
|
||||
import org.jetbrains.kotlin.jps.build.KotlinBuilder
|
||||
import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget
|
||||
import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol
|
||||
import org.jetbrains.kotlin.library.metadata.KlibMetadataSerializerProtocol
|
||||
import java.io.File
|
||||
|
||||
interface JpsIncrementalCache : IncrementalCacheCommon, StorageOwner {
|
||||
@@ -52,7 +51,7 @@ class JpsIncrementalJsCache(
|
||||
target: ModuleBuildTarget,
|
||||
paths: BuildDataPaths,
|
||||
icContext: IncrementalCompilationContext
|
||||
) : IncrementalJsCache(paths.getTargetDataRoot(target), icContext, JsSerializerProtocol), JpsIncrementalCache {
|
||||
) : IncrementalJsCache(paths.getTargetDataRoot(target), icContext, KlibMetadataSerializerProtocol), JpsIncrementalCache {
|
||||
override fun addJpsDependentCache(cache: JpsIncrementalCache) {
|
||||
if (cache is JpsIncrementalJsCache) {
|
||||
addDependentCache(cache)
|
||||
|
||||
Reference in New Issue
Block a user