From eee9f8ab3f8dcf5dee12c3487aa94824b65919a9 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Sun, 27 May 2018 16:51:11 +0300
Subject: [PATCH] Include kotlinp tests into distTest and kotlinx-metadata-jvm
 tests into coreLibsTest

kotlinp tests: do not fail due to different directory separators on Windows
---
 build.gradle.kts                                            | 6 ++++++
 build.gradle.kts.182                                        | 6 ++++++
 .../org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt   | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7b6f6f74977..32116687664 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -397,6 +397,7 @@ tasks {
         (coreLibProjects + listOf(
                 ":kotlin-stdlib:samples",
                 ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
+                ":kotlinx-metadata-jvm",
                 ":tools:binary-compatibility-validator"
         )).forEach {
             dependsOn(it + ":check")
@@ -439,6 +440,10 @@ tasks {
         dependsOn(":compiler:incremental-compilation-impl:test")
     }
 
+    "toolsTest" {
+        dependsOn(":tools:kotlinp:test")
+    }
+
     "examplesTest" {
         dependsOn("dist")
         (project(":examples").subprojects + project(":kotlin-gradle-subplugin-example")).forEach { p ->
@@ -448,6 +453,7 @@ tasks {
 
     "distTest" {
         dependsOn("compilerTest")
+        dependsOn("toolsTest")
         dependsOn("gradlePluginTest")
         dependsOn("examplesTest")
     }
diff --git a/build.gradle.kts.182 b/build.gradle.kts.182
index 08377ccf633..57a60d4726b 100644
--- a/build.gradle.kts.182
+++ b/build.gradle.kts.182
@@ -396,6 +396,7 @@ tasks {
         (coreLibProjects + listOf(
                 ":kotlin-stdlib:samples",
                 ":kotlin-test:kotlin-test-js:kotlin-test-js-it",
+                ":kotlinx-metadata-jvm",
                 ":tools:binary-compatibility-validator"
         )).forEach {
             dependsOn(it + ":check")
@@ -438,6 +439,10 @@ tasks {
         dependsOn(":compiler:incremental-compilation-impl:test")
     }
 
+    "toolsTest" {
+        dependsOn(":tools:kotlinp:test")
+    }
+
     "examplesTest" {
         dependsOn("dist")
         (project(":examples").subprojects + project(":kotlin-gradle-subplugin-example")).forEach { p ->
@@ -447,6 +452,7 @@ tasks {
 
     "distTest" {
         dependsOn("compilerTest")
+        dependsOn("toolsTest")
         dependsOn("gradlePluginTest")
         dependsOn("examplesTest")
     }
diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt
index 4d4b977a335..de00aa320e0 100644
--- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt
+++ b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt
@@ -78,7 +78,7 @@ private fun compile(file: File, disposable: Disposable, tmpdir: File, forEachOut
 }
 
 private fun StringBuilder.appendFileName(file: File) {
-    appendln("// $file")
+    appendln("// ${file.invariantSeparatorsPath}")
     appendln("// ------------------------------------------")
 }