[Test] Merge box against java tests into codegen black box tests

This commit is contained in:
Dmitriy Novozhilov
2021-01-27 16:19:22 +03:00
parent 6f3713af5f
commit 99cb85ab00
173 changed files with 117615 additions and 117302 deletions
@@ -113,10 +113,6 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
model("codegen/asmLike", targetBackend = TargetBackend.JVM)
}
testClass<AbstractBlackBoxAgainstJavaCodegenTest> {
model("codegen/boxAgainstJava")
}
testClass<AbstractJdk15BlackBoxCodegenTest> {
model("codegen/java15/box")
}
@@ -366,10 +362,6 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
model("codegen/composeLikeBytecodeText", targetBackend = TargetBackend.JVM_IR)
}
testClass<AbstractIrBlackBoxAgainstJavaCodegenTest> {
model("codegen/boxAgainstJava", targetBackend = TargetBackend.JVM_IR, excludeDirs = listOf("oldLanguageVersions"))
}
testClass<AbstractIrCompileJavaAgainstKotlinTest> {
model(
"compileJavaAgainstKotlin",
@@ -469,16 +461,6 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
}
}
testGroup(
"compiler/fir/fir2ir/tests-gen", "compiler/testData",
testRunnerMethodName = "runTestWithCustomIgnoreDirective",
additionalRunnerArguments = listOf("\"// IGNORE_BACKEND_FIR: \"")
) {
testClass<AbstractFirBlackBoxAgainstJavaCodegenTest> {
model("codegen/boxAgainstJava", targetBackend = TargetBackend.JVM_IR, excludeDirs = listOf("oldLanguageVersions"))
}
}
testGroup("compiler/fir/raw-fir/psi2fir/tests-gen", "compiler/fir/raw-fir/psi2fir/testData") {
testClass<AbstractRawFirBuilderTestCase> {
model("rawBuilder", testMethod = "doRawFirTest")
@@ -62,10 +62,12 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
testClass<AbstractBlackBoxCodegenTest> {
model("codegen/box")
model("codegen/boxAgainstJava", excludeDirs = listOf("oldLanguageVersions"))
}
testClass<AbstractIrBlackBoxCodegenTest> {
model("codegen/box", excludeDirs = listOf("oldLanguageVersions"))
model("codegen/boxAgainstJava", excludeDirs = listOf("oldLanguageVersions"))
}
testClass<AbstractJvmIrAgainstOldBoxTest> {
@@ -123,6 +125,7 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
testClass<AbstractFirBlackBoxCodegenTest> {
model("codegen/box", excludeDirs = listOf("oldLanguageVersions"))
model("codegen/boxAgainstJava", excludeDirs = listOf("oldLanguageVersions"))
}
testClass<AbstractFirBlackBoxInlineCodegenTest> {