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

Use language-version option in tests instead of excluding them

Browse Source
This commit is contained in:
Pavel Punegov
2018-08-29 18:47:48 +03:00
committed by Pavel Punegov
parent f707244152
commit 1782b4b973
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+6 -6
View File
@@ -669,6 +669,12 @@ class RunExternalTestGroup extends RunStandaloneKonanTest {
} }
} }
def languageVersion = findLinesWithPrefixesRemoved(text, "// LANGUAGE_VERSION: ")
if (languageVersion.size() != 0) {
flags.add("-language-version")
flags.add(languageVersion.first())
}
def experimentalSettings = findLinesWithPrefixesRemoved(text, "// !USE_EXPERIMENTAL: ") def experimentalSettings = findLinesWithPrefixesRemoved(text, "// !USE_EXPERIMENTAL: ")
if (experimentalSettings.size() != 0) { if (experimentalSettings.size() != 0) {
experimentalSettings.forEach { line -> experimentalSettings.forEach { line ->
@@ -849,12 +855,6 @@ fun runTest() {
return false return false
} }
def version = findLinesWithPrefixesRemoved(text, '// LANGUAGE_VERSION: ')
if (version.size() != 0 && version.contains("1.2")) {
// Support tests for 1.3 and exclude 1.2
return false
}
def targetBackend = findLinesWithPrefixesRemoved(text, "// TARGET_BACKEND") def targetBackend = findLinesWithPrefixesRemoved(text, "// TARGET_BACKEND")
if (targetBackend.size() != 0) { if (targetBackend.size() != 0) {
// There is some target backend. Check if it is NATIVE or not. // There is some target backend. Check if it is NATIVE or not.