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

[Tests] Re-enable K1 IC tests for expect-actual

Browse Source 
^KT-60831 fixed
^KT-60831 next step KT-63183


Merge-request: KT-MR-12855
Merged-by: Evgenii Mazhukin <evgenii.mazhukin@jetbrains.com>
This commit is contained in:
Evgenii Mazhukin
2023-11-06 19:46:43 +00:00
committed by Space Team
parent 4050285fef
commit 20af98c776
27 changed files with 58 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/test-generator/tests/org/jetbrains/kotlin/generators/model/SimpleTestClassModel.kt
+7 -2
View File
@@ -109,8 +109,13 @@ class SimpleTestClassModel(
val listFiles = rootFile.listFiles()
if (listFiles != null && (deep == null || deep == 0)) {
for (file in listFiles) {
val excluded = excludePattern != null && excludePattern.matcher(file.name).matches()
if (filenamePattern.matcher(file.name).matches() && !excluded) {
val excluded = let {
val name = file.name
val byPattern = excludePattern != null && excludePattern.matcher(name).matches()
val byDirectory = file.isDirectory && (name in excludeDirs || name in excludeDirsRecursively)
return@let byPattern || byDirectory
}
if (!excluded && filenamePattern.matcher(file.name).matches()) {
if (file.isDirectory && excludeParentDirs && dirHasSubDirs(file)) {
continue
}