From 70d236cb8d945087df888599c55b7254c654af8d Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 28 Mar 2018 21:03:12 +0300 Subject: [PATCH] Always configure "idea.home.path" system variable When TestLoggerFactory is initialized in tests it checks that variable and it it's not present uses classpath to search for logger configuration. If this search is unsuccessful a lot of exceptions are written to log: java.lang.RuntimeException: Could not find installation home path. Please make sure bin/idea.properties is present in the installation directory. at com.intellij.openapi.application.PathManager.getHomePath(PathManager.java:96) at com.intellij.testFramework.TestLoggerFactory.reconfigure(TestLoggerFactory.java:67) --- buildSrc/src/main/kotlin/tasks.kt | 1 + compiler/android-tests/build.gradle.kts | 1 - compiler/build.gradle.kts | 1 - compiler/incremental-compilation-impl/build.gradle.kts | 3 --- idea/build.gradle.kts | 3 --- idea/idea-android/build.gradle.kts | 3 --- idea/idea-gradle/build.gradle.kts | 3 --- idea/idea-maven/build.gradle.kts | 3 --- j2k/build.gradle.kts | 3 --- js/js.tests/build.gradle.kts | 1 - .../android-extensions-idea/build.gradle.kts | 3 --- .../android-extensions/android-extensions-jps/build.gradle.kts | 3 --- .../sam-with-receiver/sam-with-receiver-cli/build.gradle.kts | 3 --- plugins/uast-kotlin/build.gradle.kts | 3 --- 14 files changed, 1 insertion(+), 33 deletions(-) diff --git a/buildSrc/src/main/kotlin/tasks.kt b/buildSrc/src/main/kotlin/tasks.kt index d4093d18d83..ebbe8187b04 100644 --- a/buildSrc/src/main/kotlin/tasks.kt +++ b/buildSrc/src/main/kotlin/tasks.kt @@ -70,6 +70,7 @@ fun Project.projectTest(taskName: String = "test", body: Test.() -> Unit = {}): jvmArgs("-ea", "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1100m", "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true") maxHeapSize = "1100m" systemProperty("idea.is.unit.test", "true") + systemProperty("idea.home.path", intellijRootDir().canonicalPath) environment("NO_FS_ROOTS_ACCESS_CHECK", "true") environment("PROJECT_CLASSES_DIRS", the().sourceSets.getByName("test").output.classesDirs.asPath) environment("PROJECT_BUILD_DIR", buildDir) diff --git a/compiler/android-tests/build.gradle.kts b/compiler/android-tests/build.gradle.kts index 0e8300d604c..36af7db856e 100644 --- a/compiler/android-tests/build.gradle.kts +++ b/compiler/android-tests/build.gradle.kts @@ -33,7 +33,6 @@ sourceSets { projectTest { doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) environment("kotlin.tests.android.timeout", "45") } workingDir = rootDir diff --git a/compiler/build.gradle.kts b/compiler/build.gradle.kts index f40411e9378..bd902f2244c 100644 --- a/compiler/build.gradle.kts +++ b/compiler/build.gradle.kts @@ -108,7 +108,6 @@ projectTest { doFirst { systemProperty("kotlin.ant.classpath", antLauncherJar.asPath) systemProperty("kotlin.ant.launcher.class", "org.apache.tools.ant.Main") - systemProperty("idea.home.path", intellijRootDir().canonicalPath) } } diff --git a/compiler/incremental-compilation-impl/build.gradle.kts b/compiler/incremental-compilation-impl/build.gradle.kts index 12718d3ac94..bba109b2ae8 100644 --- a/compiler/incremental-compilation-impl/build.gradle.kts +++ b/compiler/incremental-compilation-impl/build.gradle.kts @@ -34,9 +34,6 @@ sourceSets { projectTest { workingDir = rootDir - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } testsJar() diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 434e66e7be0..37b8556f623 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -121,9 +121,6 @@ sourceSets { projectTest { dependsOn(":dist") workingDir = rootDir - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } testsJar {} diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 0ae609c5702..b7097e67c40 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -71,9 +71,6 @@ sourceSets { projectTest { workingDir = rootDir useAndroidSdk() - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } testsJar {} diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 5f6d36486dc..9e792beb8ae 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -77,9 +77,6 @@ testsJar() projectTest { workingDir = rootDir useAndroidSdk() - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } configureInstrumentation() diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index ff3ebf9578d..4eaa2cf74d1 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -58,7 +58,4 @@ testsJar() projectTest { workingDir = rootDir - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index f350fc3c859..542e7a64a58 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -51,9 +51,6 @@ sourceSets { projectTest { dependsOn(":dist") workingDir = rootDir - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } testsJar() diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index bfd72900d1f..3a3e84bbfe3 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -64,7 +64,6 @@ projectTest { doFirst { systemProperty("kotlin.ant.classpath", antLauncherJar.asPath) systemProperty("kotlin.ant.launcher.class", "org.apache.tools.ant.Main") - systemProperty("idea.home.path", intellijRootDir().canonicalPath) } } diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index 5940ab385cf..2af4c55fc15 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -67,9 +67,6 @@ projectTest { workingDir = rootDir useAndroidSdk() useAndroidJar() - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } runtimeJar() diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts b/plugins/android-extensions/android-extensions-jps/build.gradle.kts index 94c97c1e0ee..4aa39c892f7 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts @@ -36,9 +36,6 @@ sourceSets { projectTest { workingDir = rootDir useAndroidSdk() - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } testsJar {} \ No newline at end of file diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts index 38dc9793d14..37e6ee289a7 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts @@ -44,7 +44,4 @@ ideaPlugin { projectTest { dependsOn(":kotlin-stdlib:jvm-minimal-for-test:dist") workingDir = rootDir - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } } diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index 56508510bee..854fb20e8b4 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -47,7 +47,4 @@ testsJar {} projectTest { workingDir = rootDir - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } }