[Test] Migrate all jvm tests runners for boxInline tests

This commit is contained in:
Dmitriy Novozhilov
2021-01-27 12:07:06 +03:00
parent 8973e3f362
commit 3a0eee64b8
25 changed files with 7119 additions and 3499 deletions
@@ -113,10 +113,6 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
model("codegen/asmLike", targetBackend = TargetBackend.JVM)
}
testClass<AbstractBlackBoxInlineCodegenTest> {
model("codegen/boxInline", targetBackend = TargetBackend.JVM)
}
testClass<AbstractBlackBoxAgainstJavaCodegenTest> {
model("codegen/boxAgainstJava")
}
@@ -474,10 +470,6 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
model("debug/localVariables", targetBackend = TargetBackend.JVM_IR)
}
testClass<AbstractIrBlackBoxInlineCodegenTest> {
model("codegen/boxInline", targetBackend = TargetBackend.JVM_IR)
}
testClass<AbstractIrAsmLikeInstructionListingTest> {
model("codegen/asmLike", targetBackend = TargetBackend.JVM_IR)
}
@@ -492,37 +484,11 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
testRunnerMethodName = "runTestWithCustomIgnoreDirective",
additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_FIR: \"")
) {
testClass<AbstractFirBlackBoxInlineCodegenTest> {
model("codegen/boxInline", targetBackend = TargetBackend.JVM_IR, excludeDirs = listOf("oldLanguageVersions"))
}
testClass<AbstractFirBlackBoxAgainstJavaCodegenTest> {
model("codegen/boxAgainstJava", targetBackend = TargetBackend.JVM_IR, excludeDirs = listOf("oldLanguageVersions"))
}
}
testGroup(
"compiler/tests-gen", "compiler/testData",
testRunnerMethodName = "runTestWithCustomIgnoreDirective",
additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_MULTI_MODULE: \"")
) {
testClass<AbstractCompileKotlinAgainstInlineKotlinTest> {
model("codegen/boxInline", targetBackend = TargetBackend.JVM)
}
testClass<AbstractIrCompileKotlinAgainstInlineKotlinTest> {
model("codegen/boxInline", targetBackend = TargetBackend.JVM_IR)
}
testClass<AbstractJvmIrAgainstOldBoxInlineTest> {
model("codegen/boxInline", targetBackend = TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD)
}
testClass<AbstractJvmOldAgainstIrBoxInlineTest> {
model(
"codegen/boxInline",
targetBackend = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR
)
}
}
testGroup("compiler/fir/raw-fir/psi2fir/tests-gen", "compiler/fir/raw-fir/psi2fir/testData") {
testClass<AbstractRawFirBuilderTestCase> {
model("rawBuilder", testMethod = "doRawFirTest")
@@ -79,6 +79,30 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
testClass<AbstractIrBytecodeTextTest> {
model("codegen/bytecodeText", excludeDirs = listOf("oldLanguageVersions"))
}
testClass<AbstractBlackBoxInlineCodegenTest> {
model("codegen/boxInline")
}
testClass<AbstractIrBlackBoxInlineCodegenTest> {
model("codegen/boxInline")
}
testClass<AbstractCompileKotlinAgainstInlineKotlinTest> {
model("codegen/boxInline")
}
testClass<AbstractIrCompileKotlinAgainstInlineKotlinTest> {
model("codegen/boxInline")
}
testClass<AbstractJvmIrAgainstOldBoxInlineTest> {
model("codegen/boxInline")
}
testClass<AbstractJvmOldAgainstIrBoxInlineTest> {
model("codegen/boxInline")
}
}
// ---------------------------------------------- FIR tests ----------------------------------------------
@@ -92,6 +116,10 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
testClass<AbstractFirBlackBoxCodegenTest> {
model("codegen/box", excludeDirs = listOf("oldLanguageVersions"))
}
testClass<AbstractFirBlackBoxInlineCodegenTest> {
model("codegen/boxInline", excludeDirs = listOf("oldLanguageVersions"))
}
}
testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/fir/analysis-tests/testData") {