From c6b4117fb981ecaf1f38e36d60b37153c5892271 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 13 Dec 2018 10:41:11 +0300 Subject: [PATCH] ScriptGenTest: search classes in JPS from native IDEA gradle import output too --- .../tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt index f5a00b6d034..3066b4da8fe 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt @@ -43,7 +43,12 @@ class ScriptGenTest : CodegenTestCase() { super.setUp() additionalDependencies = System.getenv("PROJECT_CLASSES_DIRS")?.split(File.pathSeparator)?.map { File(it) } - ?: listOf("compiler/build/classes/kotlin/test", "build/compiler/classes/kotlin/test", "out/test/compiler.test") + ?: listOf( + "compiler/build/classes/kotlin/test", + "build/compiler/classes/kotlin/test", + "out/test/compiler.test", + "out/test/compiler_test" + ) .mapNotNull { File(it).canonicalFile.takeIf { it.isDirectory } } .takeIf { it.isNotEmpty() } ?: throw IllegalStateException("Unable to get classes output dirs, set PROJECT_CLASSES_DIRS environment variable")