From 136e6b64f250d78e61d2e50994e829e647539342 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 6 Apr 2018 22:13:43 +0300 Subject: [PATCH] In tests use stdlib sources from jar rather than from original locations --- .../kotlin/idea/test/ProjectDescriptorWithStdlibSources.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java index f81d41fb59f..bdcc9444d11 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/ProjectDescriptorWithStdlibSources.java @@ -22,6 +22,7 @@ import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.vfs.VfsUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import java.io.File; @@ -36,9 +37,7 @@ public class ProjectDescriptorWithStdlibSources extends KotlinWithJdkAndRuntimeL Library library = model.getModuleLibraryTable().getLibraryByName(Companion.getLIBRARY_NAME()); assert library != null; Library.ModifiableModel modifiableModel = library.getModifiableModel(); - modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("libraries/stdlib/src")), OrderRootType.SOURCES); - modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("core/builtins/src")), OrderRootType.SOURCES); - modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(new File("core/builtins/native")), OrderRootType.SOURCES); + modifiableModel.addRoot(VfsUtil.getUrlForLibraryRoot(ForTestCompileRuntime.runtimeSourcesJarForTests()), OrderRootType.SOURCES); modifiableModel.commit(); } }