From ca953d3186c7dafd41d8c51529aac38041ac3a82 Mon Sep 17 00:00:00 2001 From: Igor Chevdar Date: Wed, 17 Feb 2021 12:30:41 +0500 Subject: [PATCH] [tests] Remove explicit NI switching on in tests It is on by default anyway, but specifying it explicitly turns on specific 'compatibility' mode in FE which is not needed in K/N --- .../src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy index b8ccd2bd27e..d696fe700c4 100644 --- a/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy +++ b/kotlin-native/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy @@ -215,7 +215,10 @@ class RunExternalTestGroup extends JavaExec implements CompilerRunner { def languageSettings = findLinesWithPrefixesRemoved(text, "// !LANGUAGE: ") if (languageSettings.size() != 0) { languageSettings.forEach { line -> - line.split(" ").toList().forEach { flags.add("-XXLanguage:$it") } + line.split(" ").toList().forEach { + if (it != "+NewInference") // It is on already by default, but passing it explicitly turns on a special "compatibility mode" in FE which is not desirable. + flags.add("-XXLanguage:$it") + } } }