From 0198eeeafeda8a6d0820688e588b4d2d5c8f6fd2 Mon Sep 17 00:00:00 2001
From: Victor Petukhov <victor.petukhov@jetbrains.com>
Date: Mon, 13 Jun 2022 13:10:07 +0200
Subject: [PATCH] [Compiler tests] Remove -Dkotlin.ni flag from tests

---
 buildSrc/src/main/kotlin/tasks.kt               | 1 -
 gradle/jps.gradle.kts                           | 1 -
 gradle/modularizedTestConfigurations.gradle.kts | 1 -
 3 files changed, 3 deletions(-)

diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt
index 3f4ffaddeaa..906feed6611 100644
--- a/buildSrc/src/main/kotlin/tasks.kt
+++ b/buildSrc/src/main/kotlin/tasks.kt
@@ -202,7 +202,6 @@ fun Project.projectTest(
         environment("PROJECT_CLASSES_DIRS", project.testSourceSet.output.classesDirs.asPath)
         environment("PROJECT_BUILD_DIR", project.buildDir)
         systemProperty("jps.kotlin.home", project.rootProject.extra["distKotlinHomeDir"]!!)
-        systemProperty("kotlin.ni", if (project.rootProject.hasProperty("newInferenceTests")) "true" else "false")
         systemProperty("org.jetbrains.kotlin.skip.muted.tests", if (project.rootProject.hasProperty("skipMutedTests")) "true" else "false")
         systemProperty("cacheRedirectorEnabled", project.rootProject.findProperty("cacheRedirectorEnabled")?.toString() ?: "false")
         project.kotlinBuildProperties.junit5NumberOfThreadsForParallelExecution?.let { n ->
diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
index c7347c2f5dc..95250356ab4 100644
--- a/gradle/jps.gradle.kts
+++ b/gradle/jps.gradle.kts
@@ -103,7 +103,6 @@ fun JUnit.configureForKotlin(xmx: String = "1600m") {
         "-Didea.home.path=$ideaSdkPath",
         "-Didea.use.native.fs.for.win=false",
         "-Djps.kotlin.home=${ideaPluginDir.absolutePath}",
-        "-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false",
         "-Duse.jps=true",
         "-Djava.awt.headless=true"
     ).filterNotNull().joinToString(" ")
diff --git a/gradle/modularizedTestConfigurations.gradle.kts b/gradle/modularizedTestConfigurations.gradle.kts
index 79efee8059f..e6ee3653753 100644
--- a/gradle/modularizedTestConfigurations.gradle.kts
+++ b/gradle/modularizedTestConfigurations.gradle.kts
@@ -40,7 +40,6 @@ fun generateVmParametersForJpsConfiguration(path: String, additionalParameters:
         "-Didea.home.path=$ideaSdkPath",
         "-Didea.use.native.fs.for.win=false",
         "-Djps.kotlin.home=${ideaPluginDir.absolutePath}",
-        "-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false",
         "-Duse.jps=true",
         "-Djava.awt.headless=true"
     )