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

[WASM] Fix Kotlin.Test box tests

Browse Source
This commit is contained in:
Igor Yakovlev
2022-06-07 15:34:58 +02:00
committed by teamcity
parent f996278171
commit 3abcd84802
7 changed files with 95 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt
+5 -5
View File
@@ -12,10 +12,7 @@ import org.jetbrains.kotlin.js.test.*
import org.jetbrains.kotlin.js.test.ir.*
import org.jetbrains.kotlin.js.testOld.AbstractDceTest
import org.jetbrains.kotlin.js.testOld.compatibility.binary.AbstractJsKlibBinaryCompatibilityTest
import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractIrCodegenBoxInlineWasmTest
import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractIrCodegenBoxWasmTest
import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractIrCodegenWasmJsInteropWasmTest
import org.jetbrains.kotlin.js.testOld.wasm.semantics.AbstractJsTranslatorWasmTest
import org.jetbrains.kotlin.js.testOld.wasm.semantics.*
import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.test.runners.ir.AbstractFir2IrJsTextTest
@@ -33,10 +30,13 @@ fun main(args: Array<String>) {
testGroup("js/js.tests/tests-gen", "js/js.translator/testData", testRunnerMethodName = "runTest0") {
testClass<AbstractJsTranslatorWasmTest> {
model("box/main", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.WASM)
model("box/kotlin.test/", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.WASM)
model("box/native/", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.WASM)
}
testClass<AbstractJsTranslatorUnitWasmTest> {
model("box/kotlin.test/", pattern = "^([^_](.+))\\.kt$", targetBackend = TargetBackend.WASM)
}
testClass<AbstractDceTest> {
model("dce/", pattern = "(.+)\\.js", targetBackend = TargetBackend.JS)
}
js/js.tests/test/org/jetbrains/kotlin/js/testOld/BasicWasmBoxTest.kt
+5 -2
View File
@@ -39,7 +39,8 @@ import java.io.File
abstract class BasicWasmBoxTest(
private val pathToTestDir: String,
testGroupOutputDirPrefix: String,
pathToRootOutputDir: String = TEST_DATA_DIR_PATH
pathToRootOutputDir: String = TEST_DATA_DIR_PATH,
private val startUnitTests: Boolean = false
) : KotlinTestWithEnvironment() {
private val testGroupOutputDirForCompilation = File(pathToRootOutputDir + "out/" + testGroupOutputDirPrefix)
@@ -147,12 +148,14 @@ abstract class BasicWasmBoxTest(
generateWat = generateWat,
)
val startUnitTests = if (startUnitTests) "exports.startUnitTests?.();\n" else ""
val testJsQuiet = """
import exports from './index.mjs';
let actualResult
try {
actualResult = exports.box();
${startUnitTests}actualResult = exports.box();
} catch(e) {
console.log('Failed with exception!')
console.log('Message: ' + e.message)
js/js.tests/test/org/jetbrains/kotlin/js/testOld/wasm/semantics/abstractClassesForGeneratedWasmTests.kt
+6
View File
@@ -26,3 +26,9 @@ abstract class AbstractJsTranslatorWasmTest : BasicWasmBoxTest(
TEST_DATA_DIR_PATH + "box/",
"js.translator/wasmBox"
)
abstract class AbstractJsTranslatorUnitWasmTest : BasicWasmBoxTest(
TEST_DATA_DIR_PATH + "box/",
"js.translator/wasmBox",
startUnitTests = true
)