From b885b848f45f9e60fa2796828634a98ccf264f74 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 18 Oct 2019 18:21:26 +0300
Subject: [PATCH] Allow to mute test working with directories

---
 .../org/jetbrains/kotlin/test/muteWithFile.kt | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithFile.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithFile.kt
index f981a2e68ec..f1b18d2ce6a 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithFile.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithFile.kt
@@ -55,10 +55,6 @@ fun testWithMuteInFile(test: DoTest, extraSuffix: String): DoTest {
 }
 
 private fun isMutedWithFile(testPathFile: File, extraSuffix: String): Boolean {
-    if (!testPathFile.isFile) {
-        return false
-    }
-
     return muteFile(testPathFile, extraSuffix) != null
 }
 
@@ -68,8 +64,21 @@ private fun createMuteFile(testDataFile: File, extraSuffix: String, text: String
     muteFileNoCheck(testDataFile, extraSuffix).writeText(text)
 }
 
+private fun rawFileNoChecks(testPathFile: File, extraSuffix: String, suffix: String): File {
+    return when {
+        testPathFile.isDirectory ->
+            File(testPathFile, "${testPathFile.name}$extraSuffix$suffix")
+        else ->
+            File("${testPathFile.path}$extraSuffix$suffix")
+    }
+}
+
 private fun muteFileNoCheck(testPathFile: File, extraSuffix: String): File {
-    return File("${testPathFile.path}$extraSuffix.mute")
+    return rawFileNoChecks(testPathFile, extraSuffix, ".mute")
+}
+
+private fun failFileNoCheck(testPathFile: File, extraSuffix: String): File {
+    return rawFileNoChecks(testPathFile, extraSuffix, ".fail")
 }
 
 private fun muteFile(testPathFile: File, extraSuffix: String): File? {
@@ -83,9 +92,8 @@ private fun muteFile(testPathFile: File, extraSuffix: String): File? {
 }
 
 private fun failFile(testDataFile: File, extraSuffix: String): File? {
-    if (!testDataFile.isFile) return null
+    val failFile = failFileNoCheck(testDataFile, extraSuffix)
 
-    val failFile = File("${testDataFile.path}$extraSuffix.fail")
     if (!failFile.exists() || !failFile.isFile) {
         return null
     }