Fix tests in the new build infrastructure

This commit is contained in:
Ilya Chernikov
2017-08-24 17:11:23 +03:00
parent a61facf3d1
commit d039d191f2
48 changed files with 383 additions and 228 deletions
+17 -8
View File
@@ -10,9 +10,10 @@ dependencies {
testCompile(project(":js:js.serializer"))
testCompile(project(":js:js.dce"))
testCompile(ideaSdkDeps("openapi", "idea"))
testRuntime(project(":kotlin-stdlib"))
testRuntime(projectDist(":kotlin-stdlib"))
testRuntime(project(":compiler:backend-common"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(commonDep("org.fusesource.jansi", "jansi"))
}
sourceSets {
@@ -20,14 +21,22 @@ sourceSets {
"test" { projectDefault() }
}
val test: Test by tasks
test.apply {
dependsOnTaskIfExistsRec("dist", project = rootProject)
dependsOn(":prepare:mock-runtime-for-test:dist")
val testDistProjects = listOf(
"", // for root project
":prepare:mock-runtime-for-test",
":kotlin-compiler",
":kotlin-runtime",
":kotlin-script-runtime",
":kotlin-stdlib",
":kotlin-stdlib-js",
":kotlin-test:kotlin-test-jvm",
":kotlin-test:kotlin-test-junit",
":kotlin-daemon-client",
":kotlin-ant")
projectTest {
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
workingDir = rootDir
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
ignoreFailures = true
}
testsJar {}