From 48d45b54db1e2b9dffcf74754061435d76b2220a Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Tue, 24 Nov 2015 16:01:52 +0300 Subject: [PATCH] Add kotlin.test library to build distribution and provide for tests Original commit: b57d2ff702f0051be390532ec8d045d7dd3dfe66 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 1 + .../kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index ea41dcde371..11d72201d7c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -500,6 +500,7 @@ public abstract class AbstractIncrementalJpsTest( moduleNames = nameToModule.keySet() } AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject) + AbstractKotlinJpsBuildTestCase.addKotlinTestRuntimeDependency(myProject) return moduleNames } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index b633b033098..ede371c900a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -91,6 +91,10 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); } + static JpsLibrary addKotlinTestRuntimeDependency(@NotNull JpsProject project) { + return addDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false, "kotlin-test", PathUtil.getKotlinPathsForDistDirectory().getKotlinTestPath()); + } + static JpsLibrary addKotlinJavaScriptStdlibDependency(@NotNull JpsProject project) { return addKotlinJavaScriptStdlibDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); }