Workaround for new MPP dependency configuration limitations

This commit is contained in:
Ilya Gorbunov
2018-08-16 01:04:28 +03:00
parent 6174ae7af6
commit 99de68507d
+5 -2
View File
@@ -13,6 +13,7 @@ node {
} }
val antLauncherJar by configurations.creating val antLauncherJar by configurations.creating
val testJsRuntime by configurations.creating
dependencies { dependencies {
testRuntime(intellijDep()) testRuntime(intellijDep())
@@ -33,8 +34,8 @@ dependencies {
testCompile(projectTests(":generators:test-generator")) testCompile(projectTests(":generators:test-generator"))
testRuntime(projectDist(":kotlin-stdlib")) testRuntime(projectDist(":kotlin-stdlib"))
testRuntime(projectDist(":kotlin-stdlib-js")) testJsRuntime(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-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
testRuntime(projectDist(":kotlin-reflect")) testRuntime(projectDist(":kotlin-reflect"))
testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests
testRuntime(project(":compiler:backend-common")) testRuntime(project(":compiler:backend-common"))
@@ -51,6 +52,7 @@ sourceSets {
projectTest { projectTest {
dependsOn(":dist") dependsOn(":dist")
dependsOn(testJsRuntime)
jvmArgs("-da:jdk.nashorn.internal.runtime.RecompilableScriptFunctionData") // Disable assertion which fails due to a bug in nashorn (KT-23637) jvmArgs("-da:jdk.nashorn.internal.runtime.RecompilableScriptFunctionData") // Disable assertion which fails due to a bug in nashorn (KT-23637)
workingDir = rootDir workingDir = rootDir
if (findProperty("kotlin.compiler.js.ir.tests.skip")?.toString()?.toBoolean() == true) { if (findProperty("kotlin.compiler.js.ir.tests.skip")?.toString()?.toBoolean() == true) {
@@ -66,6 +68,7 @@ testsJar {}
projectTest("quickTest") { projectTest("quickTest") {
dependsOn(":dist") dependsOn(":dist")
dependsOn(testJsRuntime)
workingDir = rootDir workingDir = rootDir
systemProperty("kotlin.js.skipMinificationTest", "true") systemProperty("kotlin.js.skipMinificationTest", "true")
doFirst { doFirst {