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

[Compiler tests] Remove -Dkotlin.ni flag from tests

Browse Source
This commit is contained in:
Victor Petukhov
2022-06-13 13:10:07 +02:00
committed by teamcity
parent 9beb279964
commit 0198eeeafe
3 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/tasks.kt
-1
View File
@@ -202,7 +202,6 @@ fun Project.projectTest(
environment("PROJECT_CLASSES_DIRS", project.testSourceSet.output.classesDirs.asPath) environment("PROJECT_CLASSES_DIRS", project.testSourceSet.output.classesDirs.asPath)
environment("PROJECT_BUILD_DIR", project.buildDir) environment("PROJECT_BUILD_DIR", project.buildDir)
systemProperty("jps.kotlin.home", project.rootProject.extra["distKotlinHomeDir"]!!) 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("org.jetbrains.kotlin.skip.muted.tests", if (project.rootProject.hasProperty("skipMutedTests")) "true" else "false")
systemProperty("cacheRedirectorEnabled", project.rootProject.findProperty("cacheRedirectorEnabled")?.toString() ?: "false") systemProperty("cacheRedirectorEnabled", project.rootProject.findProperty("cacheRedirectorEnabled")?.toString() ?: "false")
project.kotlinBuildProperties.junit5NumberOfThreadsForParallelExecution?.let { n -> project.kotlinBuildProperties.junit5NumberOfThreadsForParallelExecution?.let { n ->
gradle/jps.gradle.kts
-1
View File
@@ -103,7 +103,6 @@ fun JUnit.configureForKotlin(xmx: String = "1600m") {
"-Didea.home.path=$ideaSdkPath", "-Didea.home.path=$ideaSdkPath",
"-Didea.use.native.fs.for.win=false", "-Didea.use.native.fs.for.win=false",
"-Djps.kotlin.home=${ideaPluginDir.absolutePath}", "-Djps.kotlin.home=${ideaPluginDir.absolutePath}",
"-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false",
"-Duse.jps=true", "-Duse.jps=true",
"-Djava.awt.headless=true" "-Djava.awt.headless=true"
).filterNotNull().joinToString(" ") ).filterNotNull().joinToString(" ")
gradle/modularizedTestConfigurations.gradle.kts
-1
View File
@@ -40,7 +40,6 @@ fun generateVmParametersForJpsConfiguration(path: String, additionalParameters:
"-Didea.home.path=$ideaSdkPath", "-Didea.home.path=$ideaSdkPath",
"-Didea.use.native.fs.for.win=false", "-Didea.use.native.fs.for.win=false",
"-Djps.kotlin.home=${ideaPluginDir.absolutePath}", "-Djps.kotlin.home=${ideaPluginDir.absolutePath}",
"-Dkotlin.ni=" + if (rootProject.hasProperty("newInferenceTests")) "true" else "false",
"-Duse.jps=true", "-Duse.jps=true",
"-Djava.awt.headless=true" "-Djava.awt.headless=true"
) )