From 3aebd0315f164af3a3f838e8729f89c99d24efd9 Mon Sep 17 00:00:00 2001
From: Nikita Bobko <nikita.bobko@jetbrains.com>
Date: Mon, 7 Jun 2021 16:51:28 +0200
Subject: [PATCH] Make it possible to run
 DiagnosisCompilerTestDataSpecTestGenerated from fir-low-level-api in IJ infra

---
 .../jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt | 7 ++++---
 .../kotlin-compiler-testdata-for-ide/build.gradle.kts      | 1 +
 .../kotlin-compiler-tests-for-ide/build.gradle.kts         | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt
index a83fc325d09..f903d82ad4c 100644
--- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt
+++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt
@@ -19,14 +19,15 @@ import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestSpec
 import java.io.File
 import java.nio.file.Files
 
-fun detectDirsWithTestsMapFileOnly(dirName: String): List<String> {
+// `baseDir` is used in Kotlin plugin from IJ infra
+fun detectDirsWithTestsMapFileOnly(dirName: String, baseDir: String = "."): List<String> {
     val excludedDirs = mutableListOf<String>()
 
-    File("$SPEC_TESTDATA_PATH/$dirName").walkTopDown().forEach { file ->
+    File("${baseDir}/$SPEC_TESTDATA_PATH/$dirName").walkTopDown().forEach { file ->
         val listFiles = Files.walk(file.toPath()).filter(Files::isRegularFile)
 
         if (file.isDirectory && listFiles?.allMatch { it.endsWith(TESTS_MAP_FILENAME) } == true) {
-            val relativePath = file.relativeTo(File("$SPEC_TESTDATA_PATH/$dirName")).path
+            val relativePath = file.relativeTo(File("${baseDir}/$SPEC_TESTDATA_PATH/$dirName")).path
 
             if (!excludedDirs.any { relativePath.startsWith(it) }) {
                 excludedDirs.add(relativePath)
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts
index d0a9860fa2a..ac5d13f036c 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts
@@ -17,6 +17,7 @@ idePluginDependency {
             "compiler/fir/analysis-tests/testData/resolveWithStdlib",
             "compiler/testData/diagnostics/tests",
             "compiler/testData/diagnostics/helpers",
+            "compiler/tests-spec/testData",
             "compiler/testData/diagnostics/testsWithStdLib"
         ).forEach {
             from(rootDir.resolve(it)) {
diff --git a/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
index a661dea9dfd..43b2bc6f1b2 100644
--- a/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
+++ b/prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
@@ -7,6 +7,7 @@ publishTestJarsForIde(
         ":compiler:test-infrastructure",
         ":compiler:tests-common-new",
         ":compiler:test-infrastructure-utils",
-        ":compiler:tests-compiler-utils"
+        ":compiler:tests-compiler-utils",
+        ":compiler:tests-spec"
     )
 )