[KLIB][tests] Reorganize "klib dump-metadata" tests

- Keep the test data under "native/native.tests/testData/klib/" dir
- Rename tests from "klib contents" to "klib dump-metadata"

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeKlibDumpMetadataTestGenerated.java

@@ -18,199 +18,199 @@ 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/klibContents")
+@TestMetadata("native/native.tests/testData/klib/dump-metadata")
 @TestDataPath("$PROJECT_ROOT")
 @Tag("frontend-fir")
 @FirPipeline()
-public class FirNativeKlibContentsTestGenerated extends AbstractNativeKlibContentsTest {
+public class FirNativeKlibDumpMetadataTestGenerated extends AbstractNativeKlibDumpMetadataTest {
     @Test
-    public void testAllFilesPresentInKlibContents() throws Exception {
+    public void testAllFilesPresentInDump_metadata() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents"), Pattern.compile("^([^_](.+)).kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata"), Pattern.compile("^([^_](.+)).kt$"), null, true);
     }
 
     @Test
     @TestMetadata("annotations.kt")
     public void testAnnotations() throws Exception {
-        runTest("native/native.tests/testData/klibContents/annotations.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/annotations.kt");
     }
 
     @Test
     @TestMetadata("annotations_source_retention.kt")
     public void testAnnotations_source_retention() throws Exception {
-        runTest("native/native.tests/testData/klibContents/annotations_source_retention.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/annotations_source_retention.kt");
     }
 
     @Test
     @TestMetadata("data_class.kt")
     public void testData_class() throws Exception {
-        runTest("native/native.tests/testData/klibContents/data_class.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/data_class.kt");
     }
 
     @Test
     @TestMetadata("kt55464_serializeTypeAnnotation.kt")
     public void testKt55464_serializeTypeAnnotation() throws Exception {
-        runTest("native/native.tests/testData/klibContents/kt55464_serializeTypeAnnotation.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/kt55464_serializeTypeAnnotation.kt");
     }
 
     @Test
     @TestMetadata("kt56018_value_parameters_annotations.kt")
     public void testKt56018_value_parameters_annotations() throws Exception {
-        runTest("native/native.tests/testData/klibContents/kt56018_value_parameters_annotations.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/kt56018_value_parameters_annotations.kt");
     }
 
     @Test
     @TestMetadata("property_accessors.kt")
     public void testProperty_accessors() throws Exception {
-        runTest("native/native.tests/testData/klibContents/property_accessors.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/property_accessors.kt");
     }
 
     @Test
     @TestMetadata("type_annotations.kt")
     public void testType_annotations() throws Exception {
-        runTest("native/native.tests/testData/klibContents/type_annotations.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/type_annotations.kt");
     }
 
     @Nested
-    @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer")
+    @TestMetadata("native/native.tests/testData/klib/dump-metadata/builtinsSerializer")
     @TestDataPath("$PROJECT_ROOT")
     @Tag("frontend-fir")
     @FirPipeline()
     public class BuiltinsSerializer {
         @Test
         public void testAllFilesPresentInBuiltinsSerializer() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/builtinsSerializer"), Pattern.compile("^([^_](.+)).kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/builtinsSerializer"), Pattern.compile("^([^_](.+)).kt$"), null, true);
         }
 
         @Test
         @TestMetadata("annotatedEnumEntry.kt")
         public void testAnnotatedEnumEntry() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotatedEnumEntry.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.kt");
         }
 
         @Test
         @TestMetadata("annotationTargets.kt")
         public void testAnnotationTargets() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationTargets.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.kt");
         }
 
         @Test
         @TestMetadata("binaryRetainedAnnotation.kt")
         public void testBinaryRetainedAnnotation() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/binaryRetainedAnnotation.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.kt");
         }
 
         @Test
         @TestMetadata("compileTimeConstants.kt")
         public void testCompileTimeConstants() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/compileTimeConstants.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/compileTimeConstants.kt");
         }
 
         @Test
         @TestMetadata("nestedClassesAndObjects.kt")
         public void testNestedClassesAndObjects() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/nestedClassesAndObjects.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/nestedClassesAndObjects.kt");
         }
 
         @Test
         @TestMetadata("propertyAccessorAnnotations.kt")
         public void testPropertyAccessorAnnotations() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/propertyAccessorAnnotations.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/propertyAccessorAnnotations.kt");
         }
 
         @Test
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/simple.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/simple.kt");
         }
 
         @Test
         @TestMetadata("sourceRetainedAnnotation.kt")
         public void testSourceRetainedAnnotation() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/sourceRetainedAnnotation.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/sourceRetainedAnnotation.kt");
         }
 
         @Test
         @TestMetadata("stringConcatenation.kt")
         public void testStringConcatenation() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/stringConcatenation.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/stringConcatenation.kt");
         }
 
         @Test
         @TestMetadata("typeParameterAnnotation.kt")
         public void testTypeParameterAnnotation() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/typeParameterAnnotation.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/typeParameterAnnotation.kt");
         }
 
         @Nested
-        @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments")
+        @TestMetadata("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments")
         @TestDataPath("$PROJECT_ROOT")
         @Tag("frontend-fir")
         @FirPipeline()
         public class AnnotationArguments {
             @Test
             public void testAllFilesPresentInAnnotationArguments() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments"), Pattern.compile("^([^_](.+)).kt$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments"), Pattern.compile("^([^_](.+)).kt$"), null, true);
             }
 
             @Test
             @TestMetadata("annotation.kt")
             public void testAnnotation() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/annotation.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.kt");
             }
 
             @Test
             @TestMetadata("enum.kt")
             public void testEnum() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/enum.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.kt");
             }
 
             @Test
             @TestMetadata("primitiveArrays.kt")
             public void testPrimitiveArrays() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitiveArrays.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.kt");
             }
 
             @Test
             @TestMetadata("primitives.kt")
             public void testPrimitives() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitives.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.kt");
             }
 
             @Test
             @TestMetadata("string.kt")
             public void testString() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/string.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.kt");
             }
 
             @Test
             @TestMetadata("varargs.kt")
             public void testVarargs() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/varargs.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.kt");
             }
         }
     }
 
     @Nested
-    @TestMetadata("native/native.tests/testData/klibContents/klib")
+    @TestMetadata("native/native.tests/testData/klib/dump-metadata/klib")
     @TestDataPath("$PROJECT_ROOT")
     @Tag("frontend-fir")
     @FirPipeline()
     public class Klib {
         @Test
         public void testAllFilesPresentInKlib() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/klib"), Pattern.compile("^([^_](.+)).kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/klib"), Pattern.compile("^([^_](.+)).kt$"), null, true);
         }
 
         @Test
         @TestMetadata("fieldAnnotations.kt")
         public void testFieldAnnotations() throws Exception {
-            runTest("native/native.tests/testData/klibContents/klib/fieldAnnotations.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/klib/fieldAnnotations.kt");
         }
 
         @Test
         @TestMetadata("receiverAnnotations.kt")
         public void testReceiverAnnotations() throws Exception {
-            runTest("native/native.tests/testData/klibContents/klib/receiverAnnotations.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/klib/receiverAnnotations.kt");
         }
     }
 }

native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeKlibDumpMetadataTestGenerated.java

@@ -16,191 +16,191 @@ 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/klibContents")
+@TestMetadata("native/native.tests/testData/klib/dump-metadata")
 @TestDataPath("$PROJECT_ROOT")
-public class NativeKlibContentsTestGenerated extends AbstractNativeKlibContentsTest {
+public class NativeKlibDumpMetadataTestGenerated extends AbstractNativeKlibDumpMetadataTest {
     @Test
-    public void testAllFilesPresentInKlibContents() throws Exception {
+    public void testAllFilesPresentInDump_metadata() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents"), Pattern.compile("^([^_](.+)).kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata"), Pattern.compile("^([^_](.+)).kt$"), null, true);
     }
 
     @Test
     @TestMetadata("annotations.kt")
     public void testAnnotations() throws Exception {
-        runTest("native/native.tests/testData/klibContents/annotations.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/annotations.kt");
     }
 
     @Test
     @TestMetadata("annotations_source_retention.kt")
     public void testAnnotations_source_retention() throws Exception {
-        runTest("native/native.tests/testData/klibContents/annotations_source_retention.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/annotations_source_retention.kt");
     }
 
     @Test
     @TestMetadata("data_class.kt")
     public void testData_class() throws Exception {
-        runTest("native/native.tests/testData/klibContents/data_class.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/data_class.kt");
     }
 
     @Test
     @TestMetadata("kt55464_serializeTypeAnnotation.kt")
     public void testKt55464_serializeTypeAnnotation() throws Exception {
-        runTest("native/native.tests/testData/klibContents/kt55464_serializeTypeAnnotation.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/kt55464_serializeTypeAnnotation.kt");
     }
 
     @Test
     @TestMetadata("kt56018_value_parameters_annotations.kt")
     public void testKt56018_value_parameters_annotations() throws Exception {
-        runTest("native/native.tests/testData/klibContents/kt56018_value_parameters_annotations.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/kt56018_value_parameters_annotations.kt");
     }
 
     @Test
     @TestMetadata("property_accessors.kt")
     public void testProperty_accessors() throws Exception {
-        runTest("native/native.tests/testData/klibContents/property_accessors.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/property_accessors.kt");
     }
 
     @Test
     @TestMetadata("type_annotations.kt")
     public void testType_annotations() throws Exception {
-        runTest("native/native.tests/testData/klibContents/type_annotations.kt");
+        runTest("native/native.tests/testData/klib/dump-metadata/type_annotations.kt");
     }
 
     @Nested
-    @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer")
+    @TestMetadata("native/native.tests/testData/klib/dump-metadata/builtinsSerializer")
     @TestDataPath("$PROJECT_ROOT")
     public class BuiltinsSerializer {
         @Test
         public void testAllFilesPresentInBuiltinsSerializer() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/builtinsSerializer"), Pattern.compile("^([^_](.+)).kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/builtinsSerializer"), Pattern.compile("^([^_](.+)).kt$"), null, true);
         }
 
         @Test
         @TestMetadata("annotatedEnumEntry.kt")
         public void testAnnotatedEnumEntry() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotatedEnumEntry.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.kt");
         }
 
         @Test
         @TestMetadata("annotationTargets.kt")
         public void testAnnotationTargets() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationTargets.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.kt");
         }
 
         @Test
         @TestMetadata("binaryRetainedAnnotation.kt")
         public void testBinaryRetainedAnnotation() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/binaryRetainedAnnotation.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.kt");
         }
 
         @Test
         @TestMetadata("compileTimeConstants.kt")
         public void testCompileTimeConstants() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/compileTimeConstants.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/compileTimeConstants.kt");
         }
 
         @Test
         @TestMetadata("nestedClassesAndObjects.kt")
         public void testNestedClassesAndObjects() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/nestedClassesAndObjects.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/nestedClassesAndObjects.kt");
         }
 
         @Test
         @TestMetadata("propertyAccessorAnnotations.kt")
         public void testPropertyAccessorAnnotations() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/propertyAccessorAnnotations.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/propertyAccessorAnnotations.kt");
         }
 
         @Test
         @TestMetadata("simple.kt")
         public void testSimple() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/simple.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/simple.kt");
         }
 
         @Test
         @TestMetadata("sourceRetainedAnnotation.kt")
         public void testSourceRetainedAnnotation() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/sourceRetainedAnnotation.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/sourceRetainedAnnotation.kt");
         }
 
         @Test
         @TestMetadata("stringConcatenation.kt")
         public void testStringConcatenation() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/stringConcatenation.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/stringConcatenation.kt");
         }
 
         @Test
         @TestMetadata("typeParameterAnnotation.kt")
         public void testTypeParameterAnnotation() throws Exception {
-            runTest("native/native.tests/testData/klibContents/builtinsSerializer/typeParameterAnnotation.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/typeParameterAnnotation.kt");
         }
 
         @Nested
-        @TestMetadata("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments")
+        @TestMetadata("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments")
         @TestDataPath("$PROJECT_ROOT")
         public class AnnotationArguments {
             @Test
             public void testAllFilesPresentInAnnotationArguments() throws Exception {
-                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments"), Pattern.compile("^([^_](.+)).kt$"), null, true);
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments"), Pattern.compile("^([^_](.+)).kt$"), null, true);
             }
 
             @Test
             @TestMetadata("annotation.kt")
             public void testAnnotation() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/annotation.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.kt");
             }
 
             @Test
             @TestMetadata("enum.kt")
             public void testEnum() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/enum.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.kt");
             }
 
             @Test
             @TestMetadata("primitiveArrays.kt")
             public void testPrimitiveArrays() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitiveArrays.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.kt");
             }
 
             @Test
             @TestMetadata("primitives.kt")
             public void testPrimitives() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/primitives.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.kt");
             }
 
             @Test
             @TestMetadata("string.kt")
             public void testString() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/string.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.kt");
             }
 
             @Test
             @TestMetadata("varargs.kt")
             public void testVarargs() throws Exception {
-                runTest("native/native.tests/testData/klibContents/builtinsSerializer/annotationArguments/varargs.kt");
+                runTest("native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.kt");
             }
         }
     }
 
     @Nested
-    @TestMetadata("native/native.tests/testData/klibContents/klib")
+    @TestMetadata("native/native.tests/testData/klib/dump-metadata/klib")
     @TestDataPath("$PROJECT_ROOT")
     public class Klib {
         @Test
         public void testAllFilesPresentInKlib() throws Exception {
-            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klibContents/klib"), Pattern.compile("^([^_](.+)).kt$"), null, true);
+            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("native/native.tests/testData/klib/dump-metadata/klib"), Pattern.compile("^([^_](.+)).kt$"), null, true);
         }
 
         @Test
         @TestMetadata("fieldAnnotations.kt")
         public void testFieldAnnotations() throws Exception {
-            runTest("native/native.tests/testData/klibContents/klib/fieldAnnotations.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/klib/fieldAnnotations.kt");
         }
 
         @Test
         @TestMetadata("receiverAnnotations.kt")
         public void testReceiverAnnotations() throws Exception {
-            runTest("native/native.tests/testData/klibContents/klib/receiverAnnotations.kt");
+            runTest("native/native.tests/testData/klib/dump-metadata/klib/receiverAnnotations.kt");
         }
     }
 }

native/native.tests/tests/org/jetbrains/kotlin/generators/tests/GenerateNativeTests.kt

@@ -193,22 +193,22 @@ fun main() {
             }
         }
 
-        // Klib contents tests
+        // Dump KLIB metadata tests
         testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
-            testClass<AbstractNativeKlibContentsTest>(
+            testClass<AbstractNativeKlibDumpMetadataTest>(
-                suiteTestClassName = "NativeKlibContentsTestGenerated"
+                suiteTestClassName = "NativeKlibDumpMetadataTestGenerated"
             ) {
-                model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true)
+                model("klib/dump-metadata", pattern = "^([^_](.+)).kt$", recursive = true)
             }
         }
         testGroup("native/native.tests/tests-gen", "native/native.tests/testData") {
-            testClass<AbstractNativeKlibContentsTest>(
+            testClass<AbstractNativeKlibDumpMetadataTest>(
-                suiteTestClassName = "FirNativeKlibContentsTestGenerated",
+                suiteTestClassName = "FirNativeKlibDumpMetadataTestGenerated",
                 annotations = listOf(
                     *frontendFir()
                 )
             ) {
-                model("klibContents", pattern = "^([^_](.+)).kt$", recursive = true)
+                model("klib/dump-metadata", pattern = "^([^_](.+)).kt$", recursive = true)
             }
         }
 

native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/AbstractNativeKlibDumpMetadataTest.kt

@@ -21,7 +21,7 @@ import java.io.File
 
 @Tag("klib")
 @UsePartialLinkage(UsePartialLinkage.Mode.DISABLED)
-abstract class AbstractNativeKlibContentsTest : AbstractNativeSimpleTest() {
+abstract class AbstractNativeKlibDumpMetadataTest : AbstractNativeSimpleTest() {
 
     protected fun runTest(@TestDataFile testPath: String) {
         val testPathFull = getAbsoluteFile(testPath)