[Test] Properly merge box against java testdata into codegen/box

Previous commit about it was 3199ce03 and it was completely wrong
This commit is contained in:
Dmitriy Novozhilov
2021-02-04 10:43:33 +03:00
parent 21c493a854
commit 29b96aa15d
173 changed files with 120524 additions and 115185 deletions
@@ -62,12 +62,10 @@ 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> {
@@ -127,7 +125,6 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
testGroup(testsRoot = "compiler/fir/fir2ir/tests-gen", testDataRoot = "compiler/testData") {
testClass<AbstractFirBlackBoxCodegenTest> {
model("codegen/box", excludeDirs = listOf("oldLanguageVersions"))
model("codegen/boxAgainstJava", excludeDirs = listOf("oldLanguageVersions"))
}
testClass<AbstractFirBlackBoxInlineCodegenTest> {