From 117712ff406443e2a485453cd906da5d9a9adcd7 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Fri, 18 Jan 2019 17:12:39 +0300 Subject: [PATCH] Filter out tests for reflection and -DataClassInheritance --- .../src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy index 319becddbd6..015a52c530a 100644 --- a/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy +++ b/buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy @@ -898,12 +898,15 @@ fun runTest() { if (excludeList.contains(fileName)) return false + if (findLinesWithPrefixesRemoved(text, "// WITH_REFLECT").size() != 0) return false + def languageSettings = findLinesWithPrefixesRemoved(text, '// !LANGUAGE: ') if (!languageSettings.empty) { def settings = languageSettings.first() if (settings.contains('-ProperIeee754Comparisons') || // K/N supports only proper IEEE754 comparisons settings.contains('+NewInference') || // New inference is not implemented - settings.contains('-ReleaseCoroutines')) { // only release coroutines + settings.contains('-ReleaseCoroutines') || // only release coroutines + settings.contains('-DataClassInheritance')) { // old behavior is not supported return false } } @@ -932,6 +935,7 @@ fun runTest() { if (!findLinesWithPrefixesRemoved(text, "// JVM_TARGET:").isEmpty()) { return false } return true } + } @Override