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

Set language and api versions automatically for unsigned types box tests

Browse Source 
Remove InlineClasses feature directive from tests
This commit is contained in:
Ilya Gorbunov
2018-07-02 19:24:51 +03:00
parent 181a8d7d6a
commit 16fb5f6901
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/unsignedTypes/checkBasicUnsignedLiterals.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// !LANGUAGE: +InlineClasses
// !SKIP_METADATA_VERSION_CHECK
// IGNORE_BACKEND: JVM_IR
// WITH_UNSIGNED
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/unsignedTypes/evaluateConstructorOfUnsignedType.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// !LANGUAGE: +InlineClasses
// !SKIP_METADATA_VERSION_CHECK
// IGNORE_BACKEND: JVM_IR
// WITH_UNSIGNED
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/unsignedTypes/unsignedLiteralsWithSignedOverflow.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// !LANGUAGE: +InlineClasses
// !SKIP_METADATA_VERSION_CHECK
// IGNORE_BACKEND: JVM_IR
// WITH_UNSIGNED
// TARGET_BACKEND: JVM
compiler/testData/codegen/box/unsignedTypes/varargsOfUnsignedTypes.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// !LANGUAGE: +InlineClasses
// !SKIP_METADATA_VERSION_CHECK
// IGNORE_BACKEND: JVM_IR
// WITH_UNSIGNED
// IGNORE_BACKEND: JS, JS_IR
compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.kt
Vendored
-2
View File
@@ -1,5 +1,3 @@
// !LANGUAGE: +InlineClasses
// !SKIP_METADATA_VERSION_CHECK
// WITH_UNSIGNED
val testSimpleUIntLiteral = 1u
compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java
+9 -1
View File
@@ -68,6 +68,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettingsKt.API_VERSION_DIRECTIVE;
import static org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettingsKt.parseLanguageVersionSettings;
import static org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt.writeAllTo;
import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*;
@@ -196,9 +197,16 @@ public abstract class CodegenTestCase extends KtUsefulTestCase {
}
Map<String, String> directives = KotlinTestUtils.parseDirectives(testFile.content);
if (InTextDirectivesUtils.isDirectiveDefined(testFile.content, "WITH_UNSIGNED")) {
assertDirectivesToNull(explicitLanguageVersionSettings, explicitLanguageVersion);
explicitLanguageVersion = LanguageVersion.KOTLIN_1_3;
directives.put(API_VERSION_DIRECTIVE, ApiVersion.KOTLIN_1_3.getVersionString());
}
LanguageVersionSettings fileLanguageVersionSettings = parseLanguageVersionSettings(directives);
if (fileLanguageVersionSettings != null) {
assertDirectivesToNull(explicitLanguageVersionSettings, explicitLanguageVersion);
assertDirectivesToNull(explicitLanguageVersionSettings, null);
explicitLanguageVersionSettings = fileLanguageVersionSettings;
}
}