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

[Test] Exclude K2 MPP codegen box tests from K1 generated suites

Browse Source 
Those tests always were muted for K1 because of incompatible module
  structure in testdata, so there is no actual sense to even generate
  them for K1
This commit is contained in:
Dmitriy Novozhilov
2023-12-12 16:11:21 +02:00
committed by Space Team
parent b7bdbd270f
commit b4947e6cfe
15 changed files with 39 additions and 5162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
+2 -1
View File
@@ -85,7 +85,8 @@ fun generateJUnit3CompilerTests(args: Array<String>, mainClassName: String?) {
"compileKotlinAgainstKotlin",
"testsWithJava9",
"testsWithJava15",
"testsWithJava17"
"testsWithJava17",
"multiplatform/k2",
)
)
}
compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
+4 -3
View File
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.test.utils.CUSTOM_TEST_DATA_EXTENSION_PATTERN
fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
val excludedCustomTestdataPattern = CUSTOM_TEST_DATA_EXTENSION_PATTERN
val k2BoxTestDir = listOf("multiplatform/k2")
generateTestGroupSuiteWithJUnit5(args, mainClassName) {
testGroup(testsRoot = "compiler/tests-common-new/tests-gen", testDataRoot = "compiler/testData") {
@@ -72,15 +73,15 @@ fun generateJUnit5CompilerTests(args: Array<String>, mainClassName: String?) {
}
testClass<AbstractBlackBoxCodegenTest> {
model("codegen/box")
model("codegen/box", excludeDirs = k2BoxTestDir)
}
testClass<AbstractIrBlackBoxCodegenTest> {
model("codegen/box")
model("codegen/box", excludeDirs = k2BoxTestDir)
}
testClass<AbstractIrBlackBoxCodegenWithIrInlinerTest> {
model("codegen/box")
model("codegen/box", excludeDirs = k2BoxTestDir)
}
testClass<AbstractSteppingTest> {