From 0c6fb77637a20c0b70d4716bd122dba6776922e4 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 19 Apr 2018 20:32:26 +0300 Subject: [PATCH] Build: Set dependency on :dist for js.tests project test tasks --- js/js.tests/build.gradle.kts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 57559d5bc34..d19b0dd55c2 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -49,17 +49,8 @@ sourceSets { "test" { projectDefault() } } -val testDistProjects = listOf( - "", // for root project - ":kotlin-stdlib:jvm-minimal-for-test", - ":kotlin-compiler", - ":kotlin-script-runtime", - ":kotlin-stdlib", - ":kotlin-daemon-client", - ":kotlin-ant") - projectTest { - dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray()) + dependsOn(":dist") jvmArgs("-da:jdk.nashorn.internal.runtime.RecompilableScriptFunctionData") // Disable assertion which fails due to a bug in nashorn (KT-23637) workingDir = rootDir doFirst { @@ -71,7 +62,7 @@ projectTest { testsJar {} projectTest("quickTest") { - dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray()) + dependsOn(":dist") workingDir = rootDir systemProperty("kotlin.js.skipMinificationTest", "true") doFirst {