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

Make it possible to run DiagnosisCompilerTestDataSpecTestGenerated from fir-low-level-api in IJ infra

Browse Source
This commit is contained in:
Nikita Bobko
2021-06-07 16:51:28 +02:00
committed by teamcityserver
parent 294ec3905b
commit 3aebd0315f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-spec/tests/org/jetbrains/kotlin/spec/utils/tasks/GenerateSpecTests.kt
+4 -3
View File
@@ -19,14 +19,15 @@ import org.jetbrains.kotlin.test.runners.AbstractFirDiagnosticTestSpec
import java.io.File import java.io.File
import java.nio.file.Files 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>() 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) val listFiles = Files.walk(file.toPath()).filter(Files::isRegularFile)
if (file.isDirectory && listFiles?.allMatch { it.endsWith(TESTS_MAP_FILENAME) } == true) { 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) }) { if (!excludedDirs.any { relativePath.startsWith(it) }) {
excludedDirs.add(relativePath) excludedDirs.add(relativePath)
prepare/ide-plugin-dependencies/kotlin-compiler-testdata-for-ide/build.gradle.kts
+1
View File
@@ -17,6 +17,7 @@ idePluginDependency {
"compiler/fir/analysis-tests/testData/resolveWithStdlib", "compiler/fir/analysis-tests/testData/resolveWithStdlib",
"compiler/testData/diagnostics/tests", "compiler/testData/diagnostics/tests",
"compiler/testData/diagnostics/helpers", "compiler/testData/diagnostics/helpers",
"compiler/tests-spec/testData",
"compiler/testData/diagnostics/testsWithStdLib" "compiler/testData/diagnostics/testsWithStdLib"
).forEach { ).forEach {
from(rootDir.resolve(it)) { from(rootDir.resolve(it)) {
prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
+2 -1
View File
@@ -7,6 +7,7 @@ publishTestJarsForIde(
":compiler:test-infrastructure", ":compiler:test-infrastructure",
":compiler:tests-common-new", ":compiler:tests-common-new",
":compiler:test-infrastructure-utils", ":compiler:test-infrastructure-utils",
":compiler:tests-compiler-utils" ":compiler:tests-compiler-utils",
":compiler:tests-spec"
) )
) )