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

[JS IR BE] support multimodule tests

Browse Source
This commit is contained in:
Anton Bannykh
2018-09-17 14:17:29 +03:00
parent 2e709a81fa
commit 0660e4d616
70 changed files with 37 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+1 -1
View File
@@ -94,7 +94,7 @@ abstract class BasicBoxTest(
doTest(filePath, "OK", MainCallParameters.noCall(), coroutinesPackage)
}
fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters, coroutinesPackage: String = "") {
open fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters, coroutinesPackage: String = "") {
val file = File(filePath)
val outputDir = getOutputDir(file)
var fileContent = KotlinTestUtils.doLoadFile(file)
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicIrBoxTest.kt
+16 -1
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.js.test
import org.jetbrains.kotlin.config.*
import org.jetbrains.kotlin.ir.backend.js.Result
import org.jetbrains.kotlin.ir.backend.js.compile
import org.jetbrains.kotlin.js.config.JSConfigurationKeys
import org.jetbrains.kotlin.js.config.JsConfig
import org.jetbrains.kotlin.js.facade.MainCallParameters
import org.jetbrains.kotlin.js.facade.TranslationUnit
@@ -116,6 +117,13 @@ abstract class BasicIrBoxTest(
override var skipMinification = true
private val compilationCache = mutableMapOf<String, Result>()
override fun doTest(filePath: String, expectedResult: String, mainCallParameters: MainCallParameters, coroutinesPackage: String) {
compilationCache.clear()
super.doTest(filePath, expectedResult, mainCallParameters, coroutinesPackage)
}
override fun translateFiles(
units: List<TranslationUnit>,
outputFile: File,
@@ -153,12 +161,19 @@ abstract class BasicIrBoxTest(
runtimeFile.write(runtimeResult!!.generatedCode)
}
val dependencyPaths = config.configuration[JSConfigurationKeys.LIBRARIES]!!
val dependencies = listOf(runtimeResult!!.moduleDescriptor) + dependencyPaths.mapNotNull { compilationCache[it]?.moduleDescriptor }
val irDependencies = listOf(runtimeResult!!.moduleFragment) + compilationCache.values.map { it.moduleFragment }
val result = compile(
config.project,
filesToCompile,
config.configuration,
FqName((testPackage?.let { "$it." } ?: "") + testFunction),
listOf(runtimeResult!!))
dependencies,
irDependencies)
compilationCache[outputFile.absolutePath.let { it.substring(0, it.length - 2)} + "meta.js"] = result
outputFile.write(result.generatedCode)
}
js/js.translator/testData/box/coroutines/localVarOptimization.kt
Vendored
-1
View File
@@ -4,7 +4,6 @@
// PROPERTY_WRITE_COUNT: name=local$o count=2
// Unmute when JS_IR supports release coroutines
// IGNORE_BACKEND: JS_IR
import kotlin.coroutines.*
js/js.translator/testData/box/coroutines/nativeExceptions.kt
Vendored
-1
View File
@@ -1,7 +1,6 @@
// EXPECTED_REACHABLE_NODES: 1250
// Unmute when JS_IR supports release coroutines
// IGNORE_BACKEND: JS_IR
import kotlin.coroutines.*
import kotlin.coroutines.intrinsics.*
js/js.translator/testData/box/crossModuleRef/callableObjectRef.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1289
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/crossModuleRef/constructor.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1291
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/crossModuleRef/inheritance.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1292
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/crossModuleRef/inlineModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib1
// FILE: lib1.kt
js/js.translator/testData/box/crossModuleRef/inlineModuleNonIndentifier.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: 1
// FILE: lib1.kt
js/js.translator/testData/box/crossModuleRef/lambda.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/crossModuleRef/object.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1289
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/crossModuleRef/objectIsObject.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1284
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/crossModuleRef/topLevelMutableProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1286
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/extensionProperty/externalExtensionProperty.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1285
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inline/faultyRedundantCallElimination.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1189
// MODULE: lib
js/js.translator/testData/box/inline/inlineChainCrossModule.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// EXPECTED_REACHABLE_NODES: 1192
// IGNORE_BACKEND: JS_IR
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inline/kt26466.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// EXPECTED_REACHABLE_NODES: 1269
// IGNORE_BACKEND: JS_IR
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/anotherModuleValInClosure.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1286
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/callFunction.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1285
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/callableReference.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/calledByFqName.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/extensionLambda.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1285
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/externalInlineCallDecomposed.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1294
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/externalInlineNewDecomposed.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 5901
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/fakeFunctionInAnotherModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1282
// MODULE: lib
// FILE: lib1.kt
js/js.translator/testData/box/inlineMultiModule/importObjectInstance.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1289
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/importStdLib.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1229
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/inlineInInlineWithLambdaMultiModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1286
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/keywordAsMemberName.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1288
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/kt16144.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1304
// MODULE: m3
// FILE: m3.kt
js/js.translator/testData/box/inlineMultiModule/kt16160.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1300
// MODULE: main(module2)
// FILE: main.kt
js/js.translator/testData/box/inlineMultiModule/lambda.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/lambdaWithClosure.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/localNameClash.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/localObjectLiteralWithInheritance.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1302
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/method.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1291
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/operators.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1284
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/parameterWithDefaultValue.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1282
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/property.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1319
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/reexportDuringInline.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib1
// FILE: lib1.kt
js/js.translator/testData/box/inlineMultiModule/simple.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineMultiModule/topLevelNestedInline.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1281
// MODULE: lib
// FILE: lib1.kt
js/js.translator/testData/box/inlineMultiModule/typealiases.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1286
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineSizeReduction/inlineImportCleanup.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1280
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/inlineSizeReduction/multiModuleDefaultArgsCleanup.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1281
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/multiModule/localClassMetadata.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1319
// MODULE: lib
// FILE: lib.kt
js/js.translator/testData/box/multiModule/moduleAndVariableNameClash.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: main(module1)
// FILE: main.kt
js/js.translator/testData/box/multiModule/samePackageNames.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1304
// MODULE: lib1
// FILE: lib1.kt
js/js.translator/testData/box/multiModule/useElementsFromDefaultPackageInAnotherModule.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1285
// MODULE: main(module1)
// FILE: main.kt
js/js.translator/testData/box/multiModuleWrappers/plain/inlineFromModuleWithNonIdentifierName.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1282
// MODULE: #my-libr@ry
// FILE: bar.kt
js/js.translator/testData/box/multiModuleWrappers/plain/moduleWithNonIdentifierName.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: module-1
// FILE: bar.kt
js/js.translator/testData/box/multiModuleWrappers/plain/simple.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1283
// MODULE: module1
// FILE: bar.kt
js/js.translator/testData/box/nameClashes/localFunctionInLambda.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND: JS_IR
// EXPECTED_REACHABLE_NODES: 1287
// MODULE: lib
// FILE: lib.kt