[JS] Removing usage of legacy JS compiler #1
This commit is contained in:
committed by
Space Team
parent
662bff7351
commit
093f51c89a
+6
-3
@@ -24,12 +24,14 @@ import java.util.*
|
||||
abstract class AbstractCompileKotlinAgainstKlibTest : AbstractBlackBoxCodegenTest() {
|
||||
lateinit var klibName: String
|
||||
lateinit var outputDir: File
|
||||
lateinit var klibPath: String
|
||||
|
||||
override val backend = TargetBackend.JVM_IR
|
||||
|
||||
override fun doMultiFileTest(wholeFile: File, files: List<TestFile>) {
|
||||
outputDir = javaSourcesOutputDirectory
|
||||
klibName = Paths.get(outputDir.toString(), wholeFile.name.toString().replace(".kt", ".klib")).toString()
|
||||
klibName = wholeFile.nameWithoutExtension
|
||||
klibPath = Paths.get(outputDir.toString(), klibName + ".klib").toString()
|
||||
|
||||
val classpath: MutableList<File> = ArrayList()
|
||||
classpath.add(KtTestUtil.getAnnotationsJar())
|
||||
@@ -55,7 +57,7 @@ abstract class AbstractCompileKotlinAgainstKlibTest : AbstractBlackBoxCodegenTes
|
||||
|
||||
override fun updateConfiguration(configuration: CompilerConfiguration) {
|
||||
super.updateConfiguration(configuration)
|
||||
configuration.put(JVMConfigurationKeys.KLIB_PATHS, listOf(klibName + ".klib"))
|
||||
configuration.put(JVMConfigurationKeys.KLIB_PATHS, listOf(klibName))
|
||||
}
|
||||
|
||||
// We need real (as opposed to virtual) files in order to produce a Klib.
|
||||
@@ -76,7 +78,8 @@ abstract class AbstractCompileKotlinAgainstKlibTest : AbstractBlackBoxCodegenTes
|
||||
val (output, exitCode) = AbstractCliTest.executeCompilerGrabOutput(
|
||||
K2JSCompiler(),
|
||||
listOf(
|
||||
"-output", klibName,
|
||||
"-ir-output-dir", outputDir.normalize().absolutePath,
|
||||
"-ir-output-name", klibName,
|
||||
"-Xir-produce-klib-file",
|
||||
"-libraries", "libraries/stdlib/build/classes/kotlin/js/main/"
|
||||
) + sourceFiles
|
||||
|
||||
Reference in New Issue
Block a user