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

[Native][tests] Minor. Comments formatted

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-11-12 18:17:33 +03:00
parent 24f00f8fda
commit e5bb16c750
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/group/ExtTestCaseGroupProvider.kt
+8 -5
View File
@@ -109,7 +109,8 @@ internal class ExtTestCaseGroupProvider(
/** Tests that should be compiled and executed as standalone tests. */
private val standalones: Set<File> = listOf(
"compiler/testData/codegen/box/annotations/instances/annotationToString.kt" // Comparison of type information obtained with reflection against non-patched string literal.
// Comparison of type information obtained with reflection against non-patched string literal:
"compiler/testData/codegen/box/annotations/instances/annotationToString.kt"
).mapToSet(::getAbsoluteFile)
}
}
@@ -122,9 +123,9 @@ private class ExtTestDataFile(
private val structure by lazy {
structureFactory.ExtTestDataFileStructure(testDataFile) { line ->
if (DIRECTIVE_REGEX.matches(line)) {
// Remove all directives from test files. These directives are not needed anymore as they are already
// read and stored in [settings] property. Moreover, these directives if left in test file can potentially conflict with
// Native-specific test directives to be added (see [TestDirectives] for details). Also, they will create unnecessary "noise".
// Remove all directives from test files. These directives are not needed anymore as they are already read and stored
// in [settings] property. Moreover, these directives if left in test file can potentially conflict with Native-specific
// test directives to be added (see [TestDirectives] for details). Also, they will create unnecessary "noise".
// Examples:
// // !LANGUAGE: +NewInference
// // LANGUAGE: -ApproximateIntegerLiteralTypesInReceiverPosition
@@ -145,7 +146,9 @@ private class ExtTestDataFile(
ExtTestDataFileSettings(
languageSettings = structure.directives.multiValues(LANGUAGE_DIRECTIVE) {
it != "+NewInference" /* It is already on by default, but passing it explicitly turns on a special "compatibility mode" in FE which is not desirable. */
// It is already on by default, but passing it explicitly turns on a special "compatibility mode" in FE,
// which is not desirable.
it != "+NewInference"
},
optInsForSourceCode = optInsForSourceCode + structure.directives.multiValues(USE_EXPERIMENTAL_DIRECTIVE),
optInsForCompiler = optInsForCompiler,
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/group/TestCaseGroupProvider.kt
+2 -1
View File
@@ -152,7 +152,8 @@ internal class StandardTestCaseGroupProvider(private val environment: TestEnviro
}
if (expectFileDirectiveAfterModuleDirective) {
// Was expecting a line with the FILE directive as this is the only possible continuation of a line with the MODULE directive, but failed.
// Was expecting a line with the FILE directive as this is the only possible continuation of a line with
// the MODULE directive, but failed.
fail { "$location: ${TestDirectives.FILE} directive expected after ${TestDirectives.MODULE} directive" }
}