diff --git a/.idea/runConfigurations/Test__stdlib_js_public_kotlin_api_test__overwrite_results.xml b/.idea/runConfigurations/Test__stdlib_js_public_kotlin_api_test__overwrite_results.xml index bd731015b68..e2c35005338 100644 --- a/.idea/runConfigurations/Test__stdlib_js_public_kotlin_api_test__overwrite_results.xml +++ b/.idea/runConfigurations/Test__stdlib_js_public_kotlin_api_test__overwrite_results.xml @@ -4,7 +4,7 @@ diff --git a/build.gradle.kts b/build.gradle.kts index b1042af3083..f0d52d24ed7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -613,6 +613,7 @@ tasks { register("jsIrCompilerTest") { dependsOn(":js:js.tests:jsIrTest") + dependsOn(":js:js.tests:jsStdlibApiTest") } register("wasmCompilerTest") { diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 04987612623..628a7a45aed 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -314,6 +314,7 @@ fun Test.setUpJsBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean, firEnabled: B } exclude("org/jetbrains/kotlin/js/testOld/wasm/semantics/*") + exclude("org/jetbrains/kotlin/js/testOld/api/*") if (jsEnabled && !jsIrEnabled) { include("org/jetbrains/kotlin/integration/AntTaskJsTest.class") @@ -330,7 +331,6 @@ fun Test.setUpJsBoxTests(jsEnabled: Boolean, jsIrEnabled: Boolean, firEnabled: B include("org/jetbrains/kotlin/js/test/ir/*") include("org/jetbrains/kotlin/incremental/*") - include("org/jetbrains/kotlin/js/testOld/api/*") include("org/jetbrains/kotlin/js/testOld/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.class") include("org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.class") include("org/jetbrains/kotlin/integration/JsIrAnalysisHandlerExtensionTest.class") @@ -381,8 +381,6 @@ val test = projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5, maxHeapSiz inputs.dir(testDataDir) inputs.dir(rootDir.resolve("dist")) inputs.dir(rootDir.resolve("compiler/testData")) - inputs.dir(rootDir.resolve("libraries/stdlib/api/js")) - inputs.dir(rootDir.resolve("libraries/stdlib/api/js-v1")) outputs.dir("$buildDir/out") outputs.dir("$buildDir/out-min") @@ -411,6 +409,27 @@ projectTest("quickTest", parallel = true, jUnitMode = JUnitMode.JUnit5, maxHeapS useJUnitPlatform() } +projectTest("jsStdlibApiTest", parallel = true, maxHeapSizeMb = 4096) { + setupV8() + setupNodeJs() + dependsOn(npmInstall) + + dependsOn(":dist") + inputs.dir(rootDir.resolve("dist")) + + include("org/jetbrains/kotlin/js/testOld/api/*") + inputs.dir(rootDir.resolve("libraries/stdlib/api/js")) + inputs.dir(rootDir.resolve("libraries/stdlib/api/js-v1")) + + dependsOn(":kotlin-stdlib-js-ir:compileKotlinJs") + systemProperty("kotlin.js.full.stdlib.path", "libraries/stdlib/js-ir/build/classes/kotlin/js/main") + inputs.dir(rootDir.resolve("libraries/stdlib/js-ir/build/classes/kotlin/js/main")) + + setTestNameIncludePatterns(listOf("org.jetbrains.kotlin.js.testOld.api.ApiTest.*")) + + setUpBoxTests() +} + testsJar {} val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt") {