Fix 'Test: stdlib-js public kotlin api test' IDEA run configuration
Moving tests to another package made the IDEA run configuration obsolete. To prevent this problem in the future a separate task (jsStdlibApiTest) was introduced. The task is run in TC and will fail if the tests are missing. Merge-request: KT-MR-8128 Merged-by: Abduqodiri Qurbonzoda <abduqodiri.qurbonzoda@jetbrains.com>
This commit is contained in:
committed by
Space Team
parent
0e23ffcec9
commit
4af0f110c7
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
<option name="executionName" />
|
<option name="executionName" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
<option name="externalSystemIdString" value="GRADLE" />
|
<option name="externalSystemIdString" value="GRADLE" />
|
||||||
<option name="scriptParameters" value=":js:js.tests:cleanTest :js:js.tests:test --tests "org.jetbrains.kotlin.js.testOld.ApiTest" -Poverwrite.output=true --parallel" />
|
<option name="scriptParameters" value=":js:js.tests:cleanTest :js:js.tests:jsStdlibApiTest -Poverwrite.output=true --parallel" />
|
||||||
<option name="taskDescriptions">
|
<option name="taskDescriptions">
|
||||||
<list />
|
<list />
|
||||||
</option>
|
</option>
|
||||||
|
|||||||
@@ -613,6 +613,7 @@ tasks {
|
|||||||
|
|
||||||
register("jsIrCompilerTest") {
|
register("jsIrCompilerTest") {
|
||||||
dependsOn(":js:js.tests:jsIrTest")
|
dependsOn(":js:js.tests:jsIrTest")
|
||||||
|
dependsOn(":js:js.tests:jsStdlibApiTest")
|
||||||
}
|
}
|
||||||
|
|
||||||
register("wasmCompilerTest") {
|
register("wasmCompilerTest") {
|
||||||
|
|||||||
@@ -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/wasm/semantics/*")
|
||||||
|
exclude("org/jetbrains/kotlin/js/testOld/api/*")
|
||||||
|
|
||||||
if (jsEnabled && !jsIrEnabled) {
|
if (jsEnabled && !jsIrEnabled) {
|
||||||
include("org/jetbrains/kotlin/integration/AntTaskJsTest.class")
|
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/js/test/ir/*")
|
||||||
|
|
||||||
include("org/jetbrains/kotlin/incremental/*")
|
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/js/testOld/compatibility/binary/JsKlibBinaryCompatibilityTestGenerated.class")
|
||||||
include("org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.class")
|
include("org/jetbrains/kotlin/benchmarks/GenerateIrRuntime.class")
|
||||||
include("org/jetbrains/kotlin/integration/JsIrAnalysisHandlerExtensionTest.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(testDataDir)
|
||||||
inputs.dir(rootDir.resolve("dist"))
|
inputs.dir(rootDir.resolve("dist"))
|
||||||
inputs.dir(rootDir.resolve("compiler/testData"))
|
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")
|
||||||
outputs.dir("$buildDir/out-min")
|
outputs.dir("$buildDir/out-min")
|
||||||
@@ -411,6 +409,27 @@ projectTest("quickTest", parallel = true, jUnitMode = JUnitMode.JUnit5, maxHeapS
|
|||||||
useJUnitPlatform()
|
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 {}
|
testsJar {}
|
||||||
|
|
||||||
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt") {
|
val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt") {
|
||||||
|
|||||||
Reference in New Issue
Block a user