From ab32f90117b0fa806597757c48913569f9cf792f Mon Sep 17 00:00:00 2001 From: Vladimir Sukharev Date: Wed, 8 Feb 2023 15:42:00 +0000 Subject: [PATCH] Put tags to klib contents tests Merge-request: KT-MR-8641 Merged-by: Vladimir Sukharev --- native/native.tests/build.gradle.kts | 2 ++ .../blackboxtest/NativeK1LibContentsTestGenerated.java | 5 +++++ .../blackboxtest/NativeK2LibContentsTestGenerated.java | 5 +++++ .../kotlin/generators/tests/GenerateNativeTests.kt | 7 +++++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/native/native.tests/build.gradle.kts b/native/native.tests/build.gradle.kts index b6b8a2936a9..2fd0d073454 100644 --- a/native/native.tests/build.gradle.kts +++ b/native/native.tests/build.gradle.kts @@ -52,6 +52,8 @@ val klibBinaryCompatibilityTest = nativeTest("klibBinaryCompatibilityTest", "kli val cinteropTest = nativeTest("cinteropTest", "cinterop") val debuggerTest = nativeTest("debuggerTest", "debugger") val cachesTest = nativeTest("cachesTest", "caches") +val k1libContentsTest = nativeTest("k1libContentsTest", "k1libContents") +val k2libContentsTest = nativeTest("k2libContentsTest", "k2libContents") // "test" task is created by convention. We can't just remove it. Let's enable it in developer's environment, so it can be used // to run any test from IDE or from console, but disable it at TeamCity where it is not supposed to be ever used. diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeK1LibContentsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeK1LibContentsTestGenerated.java index 0341df9242c..cdf587bf87e 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeK1LibContentsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeK1LibContentsTestGenerated.java @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.konan.blackboxtest; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.junit.jupiter.api.Tag; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -18,6 +19,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("native/native.tests/testData/klibContents") @TestDataPath("$PROJECT_ROOT") +@Tag("k1libContents") public class NativeK1LibContentsTestGenerated extends AbstractNativeKlibContentsTest { @Test public void testAllFilesPresentInKlibContents() throws Exception { @@ -57,6 +59,7 @@ public class NativeK1LibContentsTestGenerated extends AbstractNativeKlibContents @Nested @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer") @TestDataPath("$PROJECT_ROOT") + @Tag("k1libContents") public class BuiltinsSerializer { @Test public void testAllFilesPresentInBuiltinsSerializer() throws Exception { @@ -120,6 +123,7 @@ public class NativeK1LibContentsTestGenerated extends AbstractNativeKlibContents @Nested @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments") @TestDataPath("$PROJECT_ROOT") + @Tag("k1libContents") public class AnnotationArguments { @Test public void testAllFilesPresentInAnnotationArguments() throws Exception { @@ -167,6 +171,7 @@ public class NativeK1LibContentsTestGenerated extends AbstractNativeKlibContents @Nested @TestMetadata("native/native.tests/testData/klibContents/klib") @TestDataPath("$PROJECT_ROOT") + @Tag("k1libContents") public class Klib { @Test public void testAllFilesPresentInKlib() throws Exception { diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeK2LibContentsTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeK2LibContentsTestGenerated.java index a2ad4196788..d651f21cc59 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeK2LibContentsTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeK2LibContentsTestGenerated.java @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.konan.blackboxtest; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.junit.jupiter.api.Tag; import org.jetbrains.kotlin.konan.blackboxtest.support.group.K2Pipeline; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.jupiter.api.Nested; @@ -19,6 +20,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("native/native.tests/testData/klibContents") @TestDataPath("$PROJECT_ROOT") +@Tag("k2libContents") @K2Pipeline() public class NativeK2LibContentsTestGenerated extends AbstractNativeKlibContentsTest { @Test @@ -59,6 +61,7 @@ public class NativeK2LibContentsTestGenerated extends AbstractNativeKlibContents @Nested @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer") @TestDataPath("$PROJECT_ROOT") + @Tag("k2libContents") @K2Pipeline() public class BuiltinsSerializer { @Test @@ -123,6 +126,7 @@ public class NativeK2LibContentsTestGenerated extends AbstractNativeKlibContents @Nested @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments") @TestDataPath("$PROJECT_ROOT") + @Tag("k2libContents") @K2Pipeline() public class AnnotationArguments { @Test @@ -171,6 +175,7 @@ public class NativeK2LibContentsTestGenerated extends AbstractNativeKlibContents @Nested @TestMetadata("native/native.tests/testData/klibContents/klib") @TestDataPath("$PROJECT_ROOT") + @Tag("k2libContents") @K2Pipeline() public class Klib { @Test diff --git a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt index 99e60d366e3..a7122af262a 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt @@ -103,7 +103,8 @@ fun main() { // Klib contents tests testGroup("native/native.tests/tests-gen", "native/native.tests/testData") { testClass( - suiteTestClassName = "NativeK1LibContentsTestGenerated" + suiteTestClassName = "NativeK1LibContentsTestGenerated", + annotations = listOf(k1libContents()) ) { model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true) } @@ -111,7 +112,7 @@ fun main() { testGroup("native/native.tests/tests-gen", "native/native.tests/testData") { testClass( suiteTestClassName = "NativeK2LibContentsTestGenerated", - annotations = listOf(provider()) + annotations = listOf(k2libContents(), provider()) ) { model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true) } @@ -141,3 +142,5 @@ private fun codegen() = annotation(Tag::class.java, "codegen") private fun codegenK2() = annotation(Tag::class.java, "codegenK2") private fun debugger() = annotation(Tag::class.java, "debugger") private fun infrastructure() = annotation(Tag::class.java, "infrastructure") +private fun k1libContents() = annotation(Tag::class.java, "k1libContents") +private fun k2libContents() = annotation(Tag::class.java, "k2libContents")