From 5369813accc16d8261cecff56b5c16aa58d52244 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Fri, 17 Dec 2021 16:48:03 +0300 Subject: [PATCH] Fix "IdeaWin64.dll not found" error when running tests on Windows --- benchmarks/build.gradle.kts | 1 + buildSrc/src/main/kotlin/tasks.kt | 1 + compiler/fir/raw-fir/light-tree2fir/build.gradle.kts | 1 + gradle/jps.gradle.kts | 1 + gradle/modularizedTestConfigurations.gradle.kts | 1 + 5 files changed, 5 insertions(+) diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 5ba2c8813ed..516d9988c07 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -76,6 +76,7 @@ tasks.matching { it is JavaExec && it.name in benchmarkTasks }.configureEach { this as JavaExec dependsOn(":createIdeaHomeForTests") systemProperty("idea.home.path", ideaHomePathForTests().canonicalPath) + systemProperty("idea.use.native.fs.for.win", false) } tasks.register("runBenchmark") { diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index 3bfb8d1d8a1..2e1bf40cd12 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -180,6 +180,7 @@ fun Project.projectTest( maxHeapSize = "1600m" systemProperty("idea.is.unit.test", "true") systemProperty("idea.home.path", project.ideaHomePathForTests().canonicalPath) + systemProperty("idea.use.native.fs.for.win", false) systemProperty("java.awt.headless", "true") environment("NO_FS_ROOTS_ACCESS_CHECK", "true") environment("PROJECT_CLASSES_DIRS", project.testSourceSet.output.classesDirs.asPath) diff --git a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts index 622265ee9b0..e2b93279d68 100644 --- a/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts +++ b/compiler/fir/raw-fir/light-tree2fir/build.gradle.kts @@ -123,6 +123,7 @@ val jmhExec by tasks.registering(JavaExec::class) { workingDir = rootDir systemProperty("idea.home.path", project.ideaHomePathForTests().absolutePath) + systemProperty("idea.use.native.fs.for.win", false) systemProperty("idea.max.intellisense.filesize", 5000 * 1024) configurations.plusAssign(project.configurations["api"]) } diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index ca43b90c66f..dc9f0f5be86 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -25,6 +25,7 @@ fun JUnit.configureForKotlin(xmx: String = "1600m") { "-Didea.is.unit.test=true", "-Didea.ignore.disabled.plugins=true", "-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", diff --git a/gradle/modularizedTestConfigurations.gradle.kts b/gradle/modularizedTestConfigurations.gradle.kts index be25dca7403..f77885f43ed 100644 --- a/gradle/modularizedTestConfigurations.gradle.kts +++ b/gradle/modularizedTestConfigurations.gradle.kts @@ -38,6 +38,7 @@ fun generateVmParametersForJpsConfiguration(path: String, additionalParameters: "-Didea.is.unit.test=true", "-Didea.ignore.disabled.plugins=true", "-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",