azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly specify test dist dependencies

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-10-25 10:49:44 +02:00
parent 812d3d9ce6
commit afc78be58e
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/dependencies.kt
+24 -1
View File
@@ -123,4 +123,27 @@ 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-jre7",
":kotlin-stdlib-jre8",
":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"
)
compiler/android-tests/build.gradle.kts
+1
View File
@@ -34,6 +34,7 @@ sourceSets {
}
projectTest {
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
doFirst {
environment("kotlin.tests.android.timeout", "45")
}
compiler/build.gradle.kts
-24
View File
@@ -36,30 +36,6 @@ val depDistProjects = listOf(
":kotlin-stdlib",
":kotlin-test:kotlin-test-jvm"
)
// 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-jre7",
":kotlin-stdlib-jre8",
":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"
)
val antLauncherJar by configurations.creating
dependencies {
compiler/tests-different-jdk/build.gradle.kts
+1 -1
View File
@@ -25,7 +25,7 @@ sourceSets {
fun Project.codegenTest(target: Int, jvm: Int,
jdk: String = "JDK_${if (jvm <= 8) "1" else ""}$jvm",
body: Test.() -> Unit): Test = projectTest("codegenTarget${target}Jvm${jvm}Test") {
//dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
workingDir = rootDir
filter.includeTestsMatching("org.jetbrains.kotlin.codegen.jdk.JvmTarget${target}OnJvm${jvm}")