From 01053c938a77504978cf067bb785200749b5c3f4 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 20 Feb 2020 18:11:00 +0300 Subject: [PATCH] Generate IGNORE_BACKEND_FIR in black box tests properly --- .../generators/tests/GenerateInRangeExpressionTestData.kt | 7 ++++++- .../generators/tests/GenerateRangesCodegenTestData.java | 7 +++++-- .../tests/GenerateSteppedRangesCodegenTestData.kt | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt index f7efcc5d643..37c1de9ca6b 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateInRangeExpressionTestData.kt @@ -23,7 +23,12 @@ object GenerateInRangeExpressionTestData { header: String = "" ) { PrintWriter(File(GENERATED_DIR, fileName)).use { - it.generateTestCaseBody(header, rangeExpressions, elementExpressions, ignoreFrontendIR = (fileName != "charRangeLiteral.kt")) + it.generateTestCaseBody( + header, rangeExpressions, elementExpressions, + ignoreFrontendIR = fileName !in listOf( + "charRangeLiteral.kt", "charDownTo.kt", "charUntil.kt", "intDownTo.kt", "longDownTo.kt" + ) + ) } } diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java index 168b22c63b0..577e7cc084a 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java @@ -227,8 +227,11 @@ public class GenerateRangesCodegenTestData { } String fileName = testFunName + ".kt"; - writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, true); - writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, true); + boolean useFrontendIR = + testFunName.equals("emptyDownto") || testFunName.equals("emptyRange") || + testFunName.equals("reversedEmptyRange") || testFunName.equals("reversedEmptyBackSequence"); + writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, !useFrontendIR); + writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, !useFrontendIR); writeToFile(new File(UNSIGNED_AS_LITERAL_DIR, fileName), unsignedAsLiteralBody.toString(), true, true); writeToFile(new File(UNSIGNED_AS_EXPRESSION_DIR, fileName), unsignedAsExpressionBody.toString(), true, true); } diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt index 240071ff501..ef046225b7f 100644 --- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt @@ -164,7 +164,9 @@ object GenerateSteppedRangesCodegenTestData { fullSubdir.mkdirs() PrintWriter(File(fullSubdir, fileName)).use { with(it) { - println("// IGNORE_BACKEND_FIR: JVM_IR") + if (fullSubdirPath.contains("expression") || (fileName != "stepOne.kt" && fileName != "stepOneThenStepOne.kt")) { + println("// IGNORE_BACKEND_FIR: JVM_IR") + } println("// $PREAMBLE_MESSAGE") println("// KJS_WITH_FULL_RUNTIME") println("// WITH_RUNTIME")