From ca00c38fca80aa229e33e17683e34dbdd7dbfbb1 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 27 Jul 2023 14:02:40 +0200 Subject: [PATCH] [Native][tests] Use common test tag "klib" for all KLIB-related tests --- native/native.tests/build.gradle.kts | 5 +---- .../konan/blackboxtest/AbstractNativeKlibContentsTest.kt | 2 +- .../konan/blackboxtest/AbstractNativeKlibEvolutionTest.kt | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts index 8de97cc55be..0223a021fb5 100644 --- a/native/native.tests/build.gradle.kts +++ b/native/native.tests/build.gradle.kts @@ -1,5 +1,3 @@ -import org.jetbrains.kotlin.ideaExt.idea - plugins { kotlin("jvm") id("jps-compatible") @@ -50,8 +48,7 @@ val partialLinkageTest = nativeTest("partialLinkageTest", "partial-linkage") val cinteropTest = nativeTest("cinteropTest", "cinterop") val debuggerTest = nativeTest("debuggerTest", "debugger") val cachesTest = nativeTest("cachesTest", "caches") -val klibContentsTest = nativeTest("klibContentsTest", "klib-contents & !frontend-fir") -val klibContentsK2Test = nativeTest("klibContentsK2Test", "klib-contents & frontend-fir") +val klibTest = nativeTest("klibTest", "klib") val testTags = findProperty("kotlin.native.tests.tags")?.toString() // Note: arbitrary JUnit tag expressions can be used in this property. diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt index 6815d032d04..86ae9ce60c1 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibContentsTest.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertEqualsToFile import org.junit.jupiter.api.Tag import java.io.File -@Tag("klib-contents") +@Tag("klib") @UsePartialLinkage(UsePartialLinkage.Mode.DISABLED) abstract class AbstractNativeKlibContentsTest : AbstractNativeSimpleTest() { diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibEvolutionTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibEvolutionTest.kt index 43792ca24f1..c74b93edd56 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibEvolutionTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibEvolutionTest.kt @@ -32,7 +32,7 @@ import kotlin.math.max import org.jetbrains.kotlin.compatibility.binary.TestFile as TFile import org.jetbrains.kotlin.compatibility.binary.TestModule as TModule -@Tag("klib-evolution") +@Tag("klib") @UsePartialLinkage(UsePartialLinkage.Mode.DISABLED) abstract class AbstractNativeKlibEvolutionTest : AbstractNativeSimpleTest() { // Const evaluation tests muted for FIR because FIR does const propagation.