Include kotlinp tests into distTest and kotlinx-metadata-jvm tests into coreLibsTest

kotlinp tests: do not fail due to different directory separators on Windows
This commit is contained in:
Ilya Gorbunov
2018-05-27 16:51:11 +03:00
parent d86947207c
commit eee9f8ab3f
3 changed files with 13 additions and 1 deletions
+6
View File
@@ -397,6 +397,7 @@ tasks {
(coreLibProjects + listOf( (coreLibProjects + listOf(
":kotlin-stdlib:samples", ":kotlin-stdlib:samples",
":kotlin-test:kotlin-test-js:kotlin-test-js-it", ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
":kotlinx-metadata-jvm",
":tools:binary-compatibility-validator" ":tools:binary-compatibility-validator"
)).forEach { )).forEach {
dependsOn(it + ":check") dependsOn(it + ":check")
@@ -439,6 +440,10 @@ tasks {
dependsOn(":compiler:incremental-compilation-impl:test") dependsOn(":compiler:incremental-compilation-impl:test")
} }
"toolsTest" {
dependsOn(":tools:kotlinp:test")
}
"examplesTest" { "examplesTest" {
dependsOn("dist") dependsOn("dist")
(project(":examples").subprojects + project(":kotlin-gradle-subplugin-example")).forEach { p -> (project(":examples").subprojects + project(":kotlin-gradle-subplugin-example")).forEach { p ->
@@ -448,6 +453,7 @@ tasks {
"distTest" { "distTest" {
dependsOn("compilerTest") dependsOn("compilerTest")
dependsOn("toolsTest")
dependsOn("gradlePluginTest") dependsOn("gradlePluginTest")
dependsOn("examplesTest") dependsOn("examplesTest")
} }
+6
View File
@@ -396,6 +396,7 @@ tasks {
(coreLibProjects + listOf( (coreLibProjects + listOf(
":kotlin-stdlib:samples", ":kotlin-stdlib:samples",
":kotlin-test:kotlin-test-js:kotlin-test-js-it", ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
":kotlinx-metadata-jvm",
":tools:binary-compatibility-validator" ":tools:binary-compatibility-validator"
)).forEach { )).forEach {
dependsOn(it + ":check") dependsOn(it + ":check")
@@ -438,6 +439,10 @@ tasks {
dependsOn(":compiler:incremental-compilation-impl:test") dependsOn(":compiler:incremental-compilation-impl:test")
} }
"toolsTest" {
dependsOn(":tools:kotlinp:test")
}
"examplesTest" { "examplesTest" {
dependsOn("dist") dependsOn("dist")
(project(":examples").subprojects + project(":kotlin-gradle-subplugin-example")).forEach { p -> (project(":examples").subprojects + project(":kotlin-gradle-subplugin-example")).forEach { p ->
@@ -447,6 +452,7 @@ tasks {
"distTest" { "distTest" {
dependsOn("compilerTest") dependsOn("compilerTest")
dependsOn("toolsTest")
dependsOn("gradlePluginTest") dependsOn("gradlePluginTest")
dependsOn("examplesTest") dependsOn("examplesTest")
} }
@@ -78,7 +78,7 @@ private fun compile(file: File, disposable: Disposable, tmpdir: File, forEachOut
} }
private fun StringBuilder.appendFileName(file: File) { private fun StringBuilder.appendFileName(file: File) {
appendln("// $file") appendln("// ${file.invariantSeparatorsPath}")
appendln("// ------------------------------------------") appendln("// ------------------------------------------")
} }