From 66de825508c67fe13da4084835acaa5061e308c6 Mon Sep 17 00:00:00 2001
From: Dmitriy Dolovov <Dmitriy.Dolovov@jetbrains.com>
Date: Tue, 21 Jun 2022 14:12:32 +0400
Subject: [PATCH] [Native][tests] Unmute klibABI/remove[Property|Function]
 tests

This reverts commit d60c93c1f8657017d552f8f0e6da5e1ebc6cb57b.
---
 .../blackboxtest/AbstractNativeKlibABITest.kt | 24 +++++++------------
 1 file changed, 8 insertions(+), 16 deletions(-)

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 a0e0dbdb7b1..6f8e365dc99 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
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.konan.blackboxtest.support.runner.TestExecutable
 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.Assumptions.assumeFalse
 import org.junit.jupiter.api.Tag
 import java.io.File
 
@@ -25,21 +24,14 @@ import java.io.File
 abstract class AbstractNativeKlibABITest : AbstractNativeSimpleTest() {
     private val producedKlibs = linkedMapOf<KLIB, Collection<File>>() // IMPORTANT: The order makes sense!
 
-    protected fun runTest(@TestDataFile testPath: String) {
-        assumeFalse(
-            (testPath == "compiler/testData/klibABI/removeProperty/" || testPath == "compiler/testData/klibABI/removeFunction/")
-                    && testRunSettings.get<CacheMode>().staticCacheRequiredForEveryLibrary
-        )
-
-        AbstractKlibABITestCase.doTest(
-            testDir = getAbsoluteFile(testPath),
-            buildDir = buildDir,
-            stdlibFile = stdlibFile,
-            buildKlib = ::buildKlib,
-            buildBinaryAndRun = { _, allDependencies -> buildBinaryAndRun(allDependencies) },
-            onNonEmptyBuildDirectory = ::backupDirectoryContents
-        )
-    }
+    protected fun runTest(@TestDataFile testPath: String): Unit = AbstractKlibABITestCase.doTest(
+        testDir = getAbsoluteFile(testPath),
+        buildDir = buildDir,
+        stdlibFile = stdlibFile,
+        buildKlib = ::buildKlib,
+        buildBinaryAndRun = { _, allDependencies -> buildBinaryAndRun(allDependencies) },
+        onNonEmptyBuildDirectory = ::backupDirectoryContents
+    )
 
     private fun buildKlib(moduleName: String, moduleSourceDir: File, moduleDependencies: Collection<File>, klibFile: File) {
         val module = createModule(moduleName)