From 60a77acd7abf80b503ac11028d7257b174723768 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 26 Nov 2019 18:40:25 +0900 Subject: [PATCH] Pill: Fix compiler tests (support both JPS build and Pill in JUnit 3 runner) --- .../kotlin/test/JUnit3RunnerWithInnersForJPS.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java index a141cdedfe6..a92505da7a6 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInnersForJPS.java @@ -29,6 +29,7 @@ import org.junit.runner.notification.RunNotifier; import java.io.IOException; import java.lang.reflect.Method; import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; @@ -87,7 +88,12 @@ public class JUnit3RunnerWithInnersForJPS extends Runner implements Filterable, */ private static void ensureCompilerXmlExists() { String compilerXmlSourcePath = "compiler/cli/cli-common/resources/META-INF/extensions/compiler.xml"; - String compilerXmlTargetPath = "out/production/kotlin.idea.main/META-INF/extensions/compiler.xml"; + + String jpsTargetDirectory = "out/production/kotlin.idea.main"; + String pillTargetDirectory = "out/production/idea.src"; + + String baseDir = Files.exists(Paths.get(jpsTargetDirectory)) ? jpsTargetDirectory : pillTargetDirectory; + String compilerXmlTargetPath = baseDir + "/META-INF/extensions/compiler.xml"; try { Files.copy(Paths.get(compilerXmlSourcePath), Paths.get(compilerXmlTargetPath), REPLACE_EXISTING);