From 99de68507d39bbef1961ab9913c878a47339966a Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Thu, 16 Aug 2018 01:04:28 +0300
Subject: [PATCH] Workaround for new MPP dependency configuration limitations

---
 js/js.tests/build.gradle.kts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts
index e1c0bb2b89a..407110129d3 100644
--- a/js/js.tests/build.gradle.kts
+++ b/js/js.tests/build.gradle.kts
@@ -13,6 +13,7 @@ node {
 }
 
 val antLauncherJar by configurations.creating
+val testJsRuntime by configurations.creating
 
 dependencies {
     testRuntime(intellijDep())
@@ -33,8 +34,8 @@ dependencies {
     testCompile(projectTests(":generators:test-generator"))
 
     testRuntime(projectDist(":kotlin-stdlib"))
-    testRuntime(projectDist(":kotlin-stdlib-js"))
-    testRuntime(projectDist(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
+    testJsRuntime(projectDist(":kotlin-stdlib-js"))
+    testJsRuntime(projectDist(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
     testRuntime(projectDist(":kotlin-reflect"))
     testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests
     testRuntime(project(":compiler:backend-common"))
@@ -51,6 +52,7 @@ sourceSets {
 
 projectTest {
     dependsOn(":dist")
+    dependsOn(testJsRuntime)
     jvmArgs("-da:jdk.nashorn.internal.runtime.RecompilableScriptFunctionData") // Disable assertion which fails due to a bug in nashorn (KT-23637)
     workingDir = rootDir
     if (findProperty("kotlin.compiler.js.ir.tests.skip")?.toString()?.toBoolean() == true) {
@@ -66,6 +68,7 @@ testsJar {}
 
 projectTest("quickTest") {
     dependsOn(":dist")
+    dependsOn(testJsRuntime)
     workingDir = rootDir
     systemProperty("kotlin.js.skipMinificationTest", "true")
     doFirst {