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

Fix black box test data generation (IGNORE_BACKEND_FIR)

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-04-06 18:24:20 +03:00
parent 4c6bddf6be
commit 565340667c
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java
+2 -17
View File
@@ -70,21 +70,6 @@ public class GenerateRangesCodegenTestData {
private static final Map<String, String> ELEMENT_TYPE_KNOWN_SUBSTRINGS = new HashMap<>();
private static final Map<String, String> MIN_MAX_CONSTANTS = new LinkedHashMap<>();
private static final List<String> FIR_PASSING_LITERAL_TESTS =
Arrays.asList("emptyDownto", "emptyRange", "inexactSteppedDownTo", "inexactSteppedRange",
"oneElementDownTo", "oneElementRange", "openRange",
"reversedBackSequence", "reversedEmptyBackSequence", "reversedEmptyRange",
"reversedInexactSteppedDownTo", "reversedRange", "reversedSimpleSteppedRange",
"simpleDownTo", "simpleRange", "simpleRangeWithNonConstantEnds",
"simpleSteppedDownTo", "simpleSteppedRange");
private static final List<String> FIR_PASSING_EXPRESSION_TESTS =
Arrays.asList("emptyDownto", "emptyRange", "inexactSteppedDownTo", "inexactSteppedRange",
"oneElementDownTo", "oneElementRange", "openRange",
"reversedBackSequence", "reversedEmptyBackSequence", "reversedEmptyRange",
"reversedInexactSteppedDownTo", "reversedRange", "reversedSimpleSteppedRange",
"simpleDownTo", "simpleRange", "simpleRangeWithNonConstantEnds",
"simpleSteppedDownTo", "simpleSteppedRange");
private static final List<String> FIR_PASSING_UNSIGNED_LITERAL_TESTS =
Arrays.asList("emptyDownto", "emptyRange", "reversedEmptyBackSequence", "reversedEmptyRange");
@@ -247,8 +232,8 @@ public class GenerateRangesCodegenTestData {
}
String fileName = testFunName + ".kt";
writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, !FIR_PASSING_LITERAL_TESTS.contains(testFunName));
writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, !FIR_PASSING_EXPRESSION_TESTS.contains(testFunName));
writeToFile(new File(AS_LITERAL_DIR, fileName), asLiteralBody.toString(), false, false);
writeToFile(new File(AS_EXPRESSION_DIR, fileName), asExpressionBody.toString(), false, false);
writeToFile(new File(UNSIGNED_AS_LITERAL_DIR, fileName), unsignedAsLiteralBody.toString(), true, !FIR_PASSING_UNSIGNED_LITERAL_TESTS.contains(testFunName));
writeToFile(new File(UNSIGNED_AS_EXPRESSION_DIR, fileName), unsignedAsExpressionBody.toString(), true, !FIR_PASSING_UNSIGNED_EXPRESSION_TESTS.contains(testFunName));
}
compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateSteppedRangesCodegenTestData.kt
-9
View File
@@ -147,12 +147,6 @@ object GenerateSteppedRangesCodegenTestData {
subdir: String? = null
) = listOf(true, false).forEach { generateTestsForFunction(fileName, typeToBuilderMap, function, extraCode, subdir, asLiteral = it) }
private val ignoredFrondendIRFiles = setOf(
"maxValueToMinValueStepMaxValue.kt", "maxValueToOneStepMaxValue.kt", "maxValueToZeroStepMaxValue.kt",
"minValueToMaxValueStepMaxValue.kt", "oneToMaxValueStepMaxValue.kt", "zeroToMaxValueStepMaxValue.kt",
"emptyProgressionToMinValue.kt"
)
private fun generateTestsForFunction(
fileName: String,
typeToBuilderMap: Map<Type, TestBuilder>,
@@ -170,9 +164,6 @@ object GenerateSteppedRangesCodegenTestData {
fullSubdir.mkdirs()
PrintWriter(File(fullSubdir, fileName)).use {
with(it) {
if (fileName in ignoredFrondendIRFiles) {
println("// IGNORE_BACKEND_FIR: JVM_IR")
}
println("// $PREAMBLE_MESSAGE")
println("// KJS_WITH_FULL_RUNTIME")
println("// WITH_RUNTIME")