From 88bb14d0b4f9c929350a627a4e6dae091fd48196 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sun, 15 Oct 2017 21:39:35 +0300
Subject: [PATCH] Add kotlin-test-junit dependency to compiler stdlib tests

---
 .../kotlin/codegen/forTestCompile/ForTestCompileRuntime.java  | 4 ++++
 compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
index 9f79b736a6f..932f377eaa8 100644
--- a/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
+++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -45,6 +45,10 @@ public class ForTestCompileRuntime {
     public static File kotlinTestJarForTests() {
         return assertExists(new File("dist/kotlinc/lib/kotlin-test.jar"));
     }
+    @NotNull
+    public static File kotlinTestJunitJarForTests() {
+        return assertExists(new File("dist/kotlinc/lib/kotlin-test-junit.jar"));
+    }
 
     @NotNull
     public static File reflectJarForTests() {
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
index 55f2063d5f6..631dfd4a819 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
@@ -57,6 +57,7 @@ public class StdlibTest extends KotlinTestWithEnvironment {
         CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_NO_RUNTIME, TestJdkKind.FULL_JDK, runtimeClasspath);
 
         JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.kotlinTestJarForTests());
+        JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.kotlinTestJunitJarForTests());
 
         File junitJar = new File("libraries/lib/junit-4.11.jar");
         assertTrue(junitJar.exists());