From b5655dfaaca2cbb4f738bd654158a1db46fdefff Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Mon, 29 Aug 2022 16:44:01 +0200
Subject: [PATCH] [IR][tests] Ignore muted ABI compatibility tests

---
 .../jetbrains/kotlin/klib/AbstractKlibABITestCase.kt  | 11 +++++++++--
 .../konan/blackboxtest/AbstractNativeKlibABITest.kt   |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibABITestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibABITestCase.kt
index 937a493099e..4b91c3f9bc8 100644
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibABITestCase.kt
+++ b/compiler/tests-common/tests/org/jetbrains/kotlin/klib/AbstractKlibABITestCase.kt
@@ -55,7 +55,8 @@ abstract class AbstractKlibABITestCase : KtUsefulTestCase() {
         stdlibFile = stdlibFile(),
         buildKlib = ::buildKlib,
         buildBinaryAndRun = ::buildBinaryAndRun,
-        onNonEmptyBuildDirectory = { directory -> directory.listFiles()?.forEach(File::deleteRecursively) }
+        onNonEmptyBuildDirectory = { directory -> directory.listFiles()?.forEach(File::deleteRecursively) },
+        onIgnoredTest = { /* Do nothing specific. JUnit 3 does not support programmatic tests muting. */ }
     )
 
     companion object {
@@ -65,13 +66,19 @@ abstract class AbstractKlibABITestCase : KtUsefulTestCase() {
             stdlibFile: File,
             buildKlib: (moduleName: String, moduleSourceDir: File, moduleDependencies: Collection<File>, klibFile: File) -> Unit,
             buildBinaryAndRun: (mainModuleKlibFile: File, allDependencies: Collection<File>) -> Unit,
-            onNonEmptyBuildDirectory: (directory: File) -> Unit
+            onNonEmptyBuildDirectory: (directory: File) -> Unit,
+            onIgnoredTest: () -> Unit
         ) {
             val projectName = testDir.name
 
             val projectInfoFile = File(testDir, PROJECT_INFO_FILE)
             val projectInfo: ProjectInfo = ProjectInfoParser(projectInfoFile).parse(projectName)
 
+            if (projectInfo.muted) {
+                onIgnoredTest() // Ignore muted tests.
+                return
+            }
+
             val modulesMap: Map<String, ModuleUnderTest> = buildMap {
                 projectInfo.modules.forEach { moduleName ->
                     val moduleTestDir = File(testDir, moduleName)
diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt
index 6f8e365dc99..d65f3c9902d 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibABITest.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestRunChecks
 import org.jetbrains.kotlin.konan.blackboxtest.support.settings.*
 import org.jetbrains.kotlin.konan.blackboxtest.support.util.*
 import org.junit.jupiter.api.Tag
+import org.opentest4j.TestAbortedException
 import java.io.File
 
 @Tag("klib-abi")
@@ -30,7 +31,8 @@ abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() {
         stdlibFile = stdlibFile,
         buildKlib = ::buildKlib,
         buildBinaryAndRun = { _, allDependencies -> buildBinaryAndRun(allDependencies) },
-        onNonEmptyBuildDirectory = ::backupDirectoryContents
+        onNonEmptyBuildDirectory = ::backupDirectoryContents,
+        onIgnoredTest = { throw TestAbortedException() }
     )
 
     private fun buildKlib(moduleName: String, moduleSourceDir: File, moduleDependencies: Collection<File>, klibFile: File) {