Build: Drop testDistProjects, root :dist task was already in list
This commit is contained in:
@@ -1,6 +1,4 @@
|
|||||||
@file:Suppress("unused")
|
@file:Suppress("unused") // usages in build scripts are not tracked properly
|
||||||
|
|
||||||
// usages in build scripts are not tracked properly
|
|
||||||
|
|
||||||
import org.gradle.api.GradleException
|
import org.gradle.api.GradleException
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
@@ -148,24 +146,3 @@ fun AbstractCopyTask.fromEmbeddedComponents() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: it seems incomplete, find and add missing dependencies
|
|
||||||
val testDistProjects = listOf(
|
|
||||||
"", // for root project
|
|
||||||
":kotlin-stdlib:jvm-minimal-for-test",
|
|
||||||
":kotlin-compiler",
|
|
||||||
":kotlin-script-runtime",
|
|
||||||
":kotlin-stdlib",
|
|
||||||
":kotlin-stdlib-jdk7",
|
|
||||||
":kotlin-stdlib-jdk8",
|
|
||||||
":kotlin-stdlib-js",
|
|
||||||
":kotlin-reflect",
|
|
||||||
":kotlin-test:kotlin-test-jvm",
|
|
||||||
":kotlin-test:kotlin-test-junit",
|
|
||||||
":kotlin-test:kotlin-test-js",
|
|
||||||
":kotlin-preloader",
|
|
||||||
":plugins:android-extensions-compiler",
|
|
||||||
":kotlin-ant",
|
|
||||||
":kotlin-annotations-jvm",
|
|
||||||
":kotlin-annotations-android"
|
|
||||||
)
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ sourceSets {
|
|||||||
}
|
}
|
||||||
|
|
||||||
projectTest {
|
projectTest {
|
||||||
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
|
dependsOn(":dist")
|
||||||
doFirst {
|
doFirst {
|
||||||
environment("kotlin.tests.android.timeout", "45")
|
environment("kotlin.tests.android.timeout", "45")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ jar.from("../idea/resources") {
|
|||||||
}
|
}
|
||||||
|
|
||||||
projectTest {
|
projectTest {
|
||||||
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
|
dependsOn(":dist")
|
||||||
workingDir = rootDir
|
workingDir = rootDir
|
||||||
systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator))
|
systemProperty("kotlin.test.script.classpath", testSourceSet.output.classesDirs.joinToString(File.pathSeparator))
|
||||||
systemProperty("kotlin.suppress.expected.test.failures", project.findProperty("kotlin.suppress.expected.test.failures") ?: false)
|
systemProperty("kotlin.suppress.expected.test.failures", project.findProperty("kotlin.suppress.expected.test.failures") ?: false)
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ sourceSets {
|
|||||||
fun Project.codegenTest(target: Int, jvm: Int,
|
fun Project.codegenTest(target: Int, jvm: Int,
|
||||||
jdk: String = "JDK_${if (jvm <= 8) "1" else ""}$jvm",
|
jdk: String = "JDK_${if (jvm <= 8) "1" else ""}$jvm",
|
||||||
body: Test.() -> Unit): Test = projectTest("codegenTarget${target}Jvm${jvm}Test") {
|
body: Test.() -> Unit): Test = projectTest("codegenTarget${target}Jvm${jvm}Test") {
|
||||||
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
|
dependsOn(":dist")
|
||||||
workingDir = rootDir
|
workingDir = rootDir
|
||||||
|
|
||||||
filter.includeTestsMatching("org.jetbrains.kotlin.codegen.jdk.JvmTarget${target}OnJvm${jvm}")
|
filter.includeTestsMatching("org.jetbrains.kotlin.codegen.jdk.JvmTarget${target}OnJvm${jvm}")
|
||||||
|
|||||||
Reference in New Issue
Block a user