From ec9370c30bde044d656ec1ebfea4bdd6b9550e77 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 15 Aug 2023 15:03:20 +0200 Subject: [PATCH] [KLIB][tests] Reorganize "klib dump-ir" tests - Keep the test data under "native/native.tests/testData/klib/" dir - Rename tests from "klib ir" to "klib dump-ir" --- .../{klibIr => klib/dump-ir}/class.ir.txt | 0 .../{klibIr => klib/dump-ir}/class.kt | 0 .../{klibIr => klib/dump-ir}/class.sig.ir.txt | 0 .../dump-ir}/constructor.ir.txt | 0 .../{klibIr => klib/dump-ir}/constructor.kt | 0 .../dump-ir}/constructor.sig.ir.txt | 0 .../{klibIr => klib/dump-ir}/enum.ir.txt | 0 .../testData/{klibIr => klib/dump-ir}/enum.kt | 0 .../{klibIr => klib/dump-ir}/enum.sig.ir.txt | 0 .../{klibIr => klib/dump-ir}/field.ir.txt | 0 .../{klibIr => klib/dump-ir}/field.kt | 0 .../{klibIr => klib/dump-ir}/field.sig.ir.txt | 0 .../{klibIr => klib/dump-ir}/fun.ir.txt | 0 .../testData/{klibIr => klib/dump-ir}/fun.kt | 0 .../{klibIr => klib/dump-ir}/fun.sig.ir.txt | 0 .../dump-ir}/typealias.ir.fir.txt | 0 .../{klibIr => klib/dump-ir}/typealias.ir.txt | 0 .../{klibIr => klib/dump-ir}/typealias.kt | 0 .../dump-ir}/typealias.sig.ir.fir.txt | 0 .../dump-ir}/typealias.sig.ir.txt | 0 ... => FirNativeKlibDumpIrTestGenerated.java} | 20 +++++++++---------- ...ava => NativeKlibDumpIrTestGenerated.java} | 20 +++++++++---------- .../generators/tests/GenerateNativeTests.kt | 14 ++++++------- ...est.kt => AbstractNativeKlibDumpIrTest.kt} | 2 +- 24 files changed, 28 insertions(+), 28 deletions(-) rename native/native.tests/testData/{klibIr => klib/dump-ir}/class.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/class.kt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/class.sig.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/constructor.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/constructor.kt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/constructor.sig.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/enum.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/enum.kt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/enum.sig.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/field.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/field.kt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/field.sig.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/fun.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/fun.kt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/fun.sig.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/typealias.ir.fir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/typealias.ir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/typealias.kt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/typealias.sig.ir.fir.txt (100%) rename native/native.tests/testData/{klibIr => klib/dump-ir}/typealias.sig.ir.txt (100%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/{FirNativeKlibIrTestGenerated.java => FirNativeKlibDumpIrTestGenerated.java} (67%) rename native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/{NativeKlibIrTestGenerated.java => NativeKlibDumpIrTestGenerated.java} (64%) rename native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/{AbstractNativeKlibIrTest.kt => AbstractNativeKlibDumpIrTest.kt} (98%) diff --git a/native/native.tests/testData/klibIr/class.ir.txt b/native/native.tests/testData/klib/dump-ir/class.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/class.ir.txt rename to native/native.tests/testData/klib/dump-ir/class.ir.txt diff --git a/native/native.tests/testData/klibIr/class.kt b/native/native.tests/testData/klib/dump-ir/class.kt similarity index 100% rename from native/native.tests/testData/klibIr/class.kt rename to native/native.tests/testData/klib/dump-ir/class.kt diff --git a/native/native.tests/testData/klibIr/class.sig.ir.txt b/native/native.tests/testData/klib/dump-ir/class.sig.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/class.sig.ir.txt rename to native/native.tests/testData/klib/dump-ir/class.sig.ir.txt diff --git a/native/native.tests/testData/klibIr/constructor.ir.txt b/native/native.tests/testData/klib/dump-ir/constructor.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/constructor.ir.txt rename to native/native.tests/testData/klib/dump-ir/constructor.ir.txt diff --git a/native/native.tests/testData/klibIr/constructor.kt b/native/native.tests/testData/klib/dump-ir/constructor.kt similarity index 100% rename from native/native.tests/testData/klibIr/constructor.kt rename to native/native.tests/testData/klib/dump-ir/constructor.kt diff --git a/native/native.tests/testData/klibIr/constructor.sig.ir.txt b/native/native.tests/testData/klib/dump-ir/constructor.sig.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/constructor.sig.ir.txt rename to native/native.tests/testData/klib/dump-ir/constructor.sig.ir.txt diff --git a/native/native.tests/testData/klibIr/enum.ir.txt b/native/native.tests/testData/klib/dump-ir/enum.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/enum.ir.txt rename to native/native.tests/testData/klib/dump-ir/enum.ir.txt diff --git a/native/native.tests/testData/klibIr/enum.kt b/native/native.tests/testData/klib/dump-ir/enum.kt similarity index 100% rename from native/native.tests/testData/klibIr/enum.kt rename to native/native.tests/testData/klib/dump-ir/enum.kt diff --git a/native/native.tests/testData/klibIr/enum.sig.ir.txt b/native/native.tests/testData/klib/dump-ir/enum.sig.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/enum.sig.ir.txt rename to native/native.tests/testData/klib/dump-ir/enum.sig.ir.txt diff --git a/native/native.tests/testData/klibIr/field.ir.txt b/native/native.tests/testData/klib/dump-ir/field.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/field.ir.txt rename to native/native.tests/testData/klib/dump-ir/field.ir.txt diff --git a/native/native.tests/testData/klibIr/field.kt b/native/native.tests/testData/klib/dump-ir/field.kt similarity index 100% rename from native/native.tests/testData/klibIr/field.kt rename to native/native.tests/testData/klib/dump-ir/field.kt diff --git a/native/native.tests/testData/klibIr/field.sig.ir.txt b/native/native.tests/testData/klib/dump-ir/field.sig.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/field.sig.ir.txt rename to native/native.tests/testData/klib/dump-ir/field.sig.ir.txt diff --git a/native/native.tests/testData/klibIr/fun.ir.txt b/native/native.tests/testData/klib/dump-ir/fun.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/fun.ir.txt rename to native/native.tests/testData/klib/dump-ir/fun.ir.txt diff --git a/native/native.tests/testData/klibIr/fun.kt b/native/native.tests/testData/klib/dump-ir/fun.kt similarity index 100% rename from native/native.tests/testData/klibIr/fun.kt rename to native/native.tests/testData/klib/dump-ir/fun.kt diff --git a/native/native.tests/testData/klibIr/fun.sig.ir.txt b/native/native.tests/testData/klib/dump-ir/fun.sig.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/fun.sig.ir.txt rename to native/native.tests/testData/klib/dump-ir/fun.sig.ir.txt diff --git a/native/native.tests/testData/klibIr/typealias.ir.fir.txt b/native/native.tests/testData/klib/dump-ir/typealias.ir.fir.txt similarity index 100% rename from native/native.tests/testData/klibIr/typealias.ir.fir.txt rename to native/native.tests/testData/klib/dump-ir/typealias.ir.fir.txt diff --git a/native/native.tests/testData/klibIr/typealias.ir.txt b/native/native.tests/testData/klib/dump-ir/typealias.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/typealias.ir.txt rename to native/native.tests/testData/klib/dump-ir/typealias.ir.txt diff --git a/native/native.tests/testData/klibIr/typealias.kt b/native/native.tests/testData/klib/dump-ir/typealias.kt similarity index 100% rename from native/native.tests/testData/klibIr/typealias.kt rename to native/native.tests/testData/klib/dump-ir/typealias.kt diff --git a/native/native.tests/testData/klibIr/typealias.sig.ir.fir.txt b/native/native.tests/testData/klib/dump-ir/typealias.sig.ir.fir.txt similarity index 100% rename from native/native.tests/testData/klibIr/typealias.sig.ir.fir.txt rename to native/native.tests/testData/klib/dump-ir/typealias.sig.ir.fir.txt diff --git a/native/native.tests/testData/klibIr/typealias.sig.ir.txt b/native/native.tests/testData/klib/dump-ir/typealias.sig.ir.txt similarity index 100% rename from native/native.tests/testData/klibIr/typealias.sig.ir.txt rename to native/native.tests/testData/klib/dump-ir/typealias.sig.ir.txt diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibIrTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpIrTestGenerated.java similarity index 67% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibIrTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpIrTestGenerated.java index 0b28ac678bd..95d1691fd09 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibIrTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpIrTestGenerated.java @@ -18,49 +18,49 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("native/native.tests/testData/klibIr") +@TestMetadata("native/native.tests/testData/klib/dump-ir") @TestDataPath("$PROJECT_ROOT") @Tag("frontend-fir") @FirPipeline() -public class FirNativeKlibIrTestGenerated extends AbstractNativeKlibIrTest { +public class FirNativeKlibDumpIrTestGenerated extends AbstractNativeKlibDumpIrTest { @Test - public void testAllFilesPresentInKlibIr() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibIr"), Pattern.compile("^([^_](.+)).kt$"), null, true); + public void testAllFilesPresentInDump_ir() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-ir"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("class.kt") public void testClass() throws Exception { - runTest("native/native.tests/testData/klibIr/class.kt"); + runTest("native/native.tests/testData/klib/dump-ir/class.kt"); } @Test @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - runTest("native/native.tests/testData/klibIr/constructor.kt"); + runTest("native/native.tests/testData/klib/dump-ir/constructor.kt"); } @Test @TestMetadata("enum.kt") public void testEnum() throws Exception { - runTest("native/native.tests/testData/klibIr/enum.kt"); + runTest("native/native.tests/testData/klib/dump-ir/enum.kt"); } @Test @TestMetadata("field.kt") public void testField() throws Exception { - runTest("native/native.tests/testData/klibIr/field.kt"); + runTest("native/native.tests/testData/klib/dump-ir/field.kt"); } @Test @TestMetadata("fun.kt") public void testFun() throws Exception { - runTest("native/native.tests/testData/klibIr/fun.kt"); + runTest("native/native.tests/testData/klib/dump-ir/fun.kt"); } @Test @TestMetadata("typealias.kt") public void testTypealias() throws Exception { - runTest("native/native.tests/testData/klibIr/typealias.kt"); + runTest("native/native.tests/testData/klib/dump-ir/typealias.kt"); } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibIrTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpIrTestGenerated.java similarity index 64% rename from native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibIrTestGenerated.java rename to native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpIrTestGenerated.java index e91c97e9ccc..1e9d0df259c 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibIrTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpIrTestGenerated.java @@ -16,47 +16,47 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("native/native.tests/testData/klibIr") +@TestMetadata("native/native.tests/testData/klib/dump-ir") @TestDataPath("$PROJECT_ROOT") -public class NativeKlibIrTestGenerated extends AbstractNativeKlibIrTest { +public class NativeKlibDumpIrTestGenerated extends AbstractNativeKlibDumpIrTest { @Test - public void testAllFilesPresentInKlibIr() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibIr"), Pattern.compile("^([^_](.+)).kt$"), null, true); + public void testAllFilesPresentInDump_ir() throws Exception { + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-ir"), Pattern.compile("^([^_](.+)).kt$"), null, true); } @Test @TestMetadata("class.kt") public void testClass() throws Exception { - runTest("native/native.tests/testData/klibIr/class.kt"); + runTest("native/native.tests/testData/klib/dump-ir/class.kt"); } @Test @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - runTest("native/native.tests/testData/klibIr/constructor.kt"); + runTest("native/native.tests/testData/klib/dump-ir/constructor.kt"); } @Test @TestMetadata("enum.kt") public void testEnum() throws Exception { - runTest("native/native.tests/testData/klibIr/enum.kt"); + runTest("native/native.tests/testData/klib/dump-ir/enum.kt"); } @Test @TestMetadata("field.kt") public void testField() throws Exception { - runTest("native/native.tests/testData/klibIr/field.kt"); + runTest("native/native.tests/testData/klib/dump-ir/field.kt"); } @Test @TestMetadata("fun.kt") public void testFun() throws Exception { - runTest("native/native.tests/testData/klibIr/fun.kt"); + runTest("native/native.tests/testData/klib/dump-ir/fun.kt"); } @Test @TestMetadata("typealias.kt") public void testTypealias() throws Exception { - runTest("native/native.tests/testData/klibIr/typealias.kt"); + runTest("native/native.tests/testData/klib/dump-ir/typealias.kt"); } } 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 1799d22e81f..5c6e66a3ed5 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 @@ -212,22 +212,22 @@ fun main() { } } - // Klib ir tests + // Dump KLIB IR tests testGroup("native/native.tests/tests-gen", "native/native.tests/testData") { - testClass( - suiteTestClassName = "NativeKlibIrTestGenerated", + testClass( + suiteTestClassName = "NativeKlibDumpIrTestGenerated", ) { - model("klibIr", pattern = "^([^_](.+)).kt$", recursive = true) + model("klib/dump-ir", pattern = "^([^_](.+)).kt$", recursive = true) } } testGroup("native/native.tests/tests-gen", "native/native.tests/testData") { - testClass( - suiteTestClassName = "FirNativeKlibIrTestGenerated", + testClass( + suiteTestClassName = "FirNativeKlibDumpIrTestGenerated", annotations = listOf( *frontendFir() ) ) { - model("klibIr", pattern = "^([^_](.+)).kt$", recursive = true) + model("klib/dump-ir", pattern = "^([^_](.+)).kt$", recursive = true) } } diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibIrTest.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpIrTest.kt similarity index 98% rename from native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibIrTest.kt rename to native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpIrTest.kt index fdc4f117f2f..6e8a9eb5318 100644 --- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibIrTest.kt +++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpIrTest.kt @@ -28,7 +28,7 @@ import org.junit.jupiter.api.Tag import java.io.File @Tag("klib") -abstract class AbstractNativeKlibIrTest : AbstractNativeSimpleTest() { +abstract class AbstractNativeKlibDumpIrTest : AbstractNativeSimpleTest() { protected fun runTest(@TestDataFile testPath: String) { val testPathFull = getAbsoluteFile(testPath) muteTestIfNecessary(testPathFull)