[KLIB] Keep "API for KLIB ABI" test data under "compiler/testData/klib/" dir

The test data is used both in ":kotlin-util-klib-abi" and
":native:native.tests" modules. It's better to keep it together with
the test data for other KLIB tests which are also used in more than one
module, i.e. in "compiler/testData/klib/" dir.

.idea/kotlinTestDataPluginTestDataPaths.xml

@@ -89,7 +89,6 @@
         <option value="$PROJECT_DIR$/analysis/symbol-light-classes/testData" />
         <option value="$PROJECT_DIR$/analysis/low-level-api-fir/testdata" />
         <option value="$PROJECT_DIR$/native/native.tests/testData" />
-        <option value="$PROJECT_DIR$/compiler/util-klib-abi/testData" />
       </array>
     </option>
   </component>

compiler/util-klib-abi/build.gradle.kts

@@ -25,7 +25,7 @@ sourceSets {
     }
 }
 
-val testDataDir = projectDir.resolve("testData")
+val testDataDir = project(":compiler").projectDir.resolve("testData/klib/dump-abi/content")
 
 projectTest(jUnitMode = JUnitMode.JUnit5) {
     inputs.dir(testDataDir)

compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/GenerateLibraryAbiReaderTests.kt

@@ -11,7 +11,7 @@ fun main() {
     System.setProperty("java.awt.headless", "true")
 
     generateTestGroupSuiteWithJUnit5 {
-        testGroup("compiler/util-klib-abi/tests-gen", "compiler/util-klib-abi/testData") {
+        testGroup("compiler/util-klib-abi/tests-gen", "compiler/testData/klib/dump-abi") {
             testClass<AbstractFirJsLibraryAbiReaderTest> {
                 model("content")
             }

compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/ClassicJsLibraryAbiReaderTestGenerated.java

@@ -17,155 +17,155 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.library.abi.GenerateLibraryAbiReaderTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/util-klib-abi/testData/content")
+@TestMetadata("compiler/testData/klib/dump-abi/content")
 @TestDataPath("$PROJECT_ROOT")
 public class ClassicJsLibraryAbiReaderTestGenerated extends AbstractClassicJsLibraryAbiReaderTest {
     @Test
     public void testAllFilesPresentInContent() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/dump-abi/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
     }
 
     @Test
     @TestMetadata("callables.kt")
     public void testCallables() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/callables.kt");
+        runTest("compiler/testData/klib/dump-abi/content/callables.kt");
     }
 
     @Test
     @TestMetadata("classifiers.kt")
     public void testClassifiers() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/classifiers.kt");
+        runTest("compiler/testData/klib/dump-abi/content/classifiers.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_1.kt")
     public void testExcluded_classes_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_2.kt")
     public void testExcluded_classes_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_2.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_3.kt")
     public void testExcluded_classes_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_3.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_1.kt")
     public void testExcluded_packages_non_root_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_2.kt")
     public void testExcluded_packages_non_root_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_3.kt")
     public void testExcluded_packages_non_root_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_4.kt")
     public void testExcluded_packages_non_root_4() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_root_1.kt")
     public void testExcluded_packages_root_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_root_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_root_2.kt")
     public void testExcluded_packages_root_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_root_2.kt");
     }
 
     @Test
     @TestMetadata("inheritance.kt")
     public void testInheritance() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/inheritance.kt");
+        runTest("compiler/testData/klib/dump-abi/content/inheritance.kt");
     }
 
     @Test
     @TestMetadata("root_package.kt")
     public void testRoot_package() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/root_package.kt");
+        runTest("compiler/testData/klib/dump-abi/content/root_package.kt");
     }
 
     @Test
     @TestMetadata("specific_types_dnn.kt")
     public void testSpecific_types_dnn() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/specific_types_dnn.kt");
+        runTest("compiler/testData/klib/dump-abi/content/specific_types_dnn.kt");
     }
 
     @Test
     @TestMetadata("specific_types_dynamic.kt")
     public void testSpecific_types_dynamic() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/specific_types_dynamic.kt");
+        runTest("compiler/testData/klib/dump-abi/content/specific_types_dynamic.kt");
     }
 
     @Test
     @TestMetadata("type_parameters.kt")
     public void testType_parameters() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/type_parameters.kt");
+        runTest("compiler/testData/klib/dump-abi/content/type_parameters.kt");
     }
 
     @Test
     @TestMetadata("value_parameters.kt")
     public void testValue_parameters() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/value_parameters.kt");
+        runTest("compiler/testData/klib/dump-abi/content/value_parameters.kt");
     }
 
     @Test
     @TestMetadata("visibilities.kt")
     public void testVisibilities() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/visibilities.kt");
+        runTest("compiler/testData/klib/dump-abi/content/visibilities.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_1.kt")
     public void testWith_non_public_markers_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_1.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_2.kt")
     public void testWith_non_public_markers_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_2.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_3.kt")
     public void testWith_non_public_markers_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_3.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_4.kt")
     public void testWith_non_public_markers_4() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_4.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_5.kt")
     public void testWith_non_public_markers_5() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_5.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_private_annotations.kt")
     public void testWith_non_public_markers_private_annotations() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.kt");
     }
 }

compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/FirJsLibraryAbiReaderTestGenerated.java

@@ -17,155 +17,155 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.library.abi.GenerateLibraryAbiReaderTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/util-klib-abi/testData/content")
+@TestMetadata("compiler/testData/klib/dump-abi/content")
 @TestDataPath("$PROJECT_ROOT")
 public class FirJsLibraryAbiReaderTestGenerated extends AbstractFirJsLibraryAbiReaderTest {
     @Test
     public void testAllFilesPresentInContent() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/dump-abi/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
     }
 
     @Test
     @TestMetadata("callables.kt")
     public void testCallables() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/callables.kt");
+        runTest("compiler/testData/klib/dump-abi/content/callables.kt");
     }
 
     @Test
     @TestMetadata("classifiers.kt")
     public void testClassifiers() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/classifiers.kt");
+        runTest("compiler/testData/klib/dump-abi/content/classifiers.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_1.kt")
     public void testExcluded_classes_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_2.kt")
     public void testExcluded_classes_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_2.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_3.kt")
     public void testExcluded_classes_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_3.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_1.kt")
     public void testExcluded_packages_non_root_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_2.kt")
     public void testExcluded_packages_non_root_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_3.kt")
     public void testExcluded_packages_non_root_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_4.kt")
     public void testExcluded_packages_non_root_4() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_root_1.kt")
     public void testExcluded_packages_root_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_root_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_root_2.kt")
     public void testExcluded_packages_root_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_root_2.kt");
     }
 
     @Test
     @TestMetadata("inheritance.kt")
     public void testInheritance() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/inheritance.kt");
+        runTest("compiler/testData/klib/dump-abi/content/inheritance.kt");
     }
 
     @Test
     @TestMetadata("root_package.kt")
     public void testRoot_package() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/root_package.kt");
+        runTest("compiler/testData/klib/dump-abi/content/root_package.kt");
     }
 
     @Test
     @TestMetadata("specific_types_dnn.kt")
     public void testSpecific_types_dnn() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/specific_types_dnn.kt");
+        runTest("compiler/testData/klib/dump-abi/content/specific_types_dnn.kt");
     }
 
     @Test
     @TestMetadata("specific_types_dynamic.kt")
     public void testSpecific_types_dynamic() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/specific_types_dynamic.kt");
+        runTest("compiler/testData/klib/dump-abi/content/specific_types_dynamic.kt");
     }
 
     @Test
     @TestMetadata("type_parameters.kt")
     public void testType_parameters() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/type_parameters.kt");
+        runTest("compiler/testData/klib/dump-abi/content/type_parameters.kt");
     }
 
     @Test
     @TestMetadata("value_parameters.kt")
     public void testValue_parameters() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/value_parameters.kt");
+        runTest("compiler/testData/klib/dump-abi/content/value_parameters.kt");
     }
 
     @Test
     @TestMetadata("visibilities.kt")
     public void testVisibilities() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/visibilities.kt");
+        runTest("compiler/testData/klib/dump-abi/content/visibilities.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_1.kt")
     public void testWith_non_public_markers_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_1.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_2.kt")
     public void testWith_non_public_markers_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_2.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_3.kt")
     public void testWith_non_public_markers_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_3.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_4.kt")
     public void testWith_non_public_markers_4() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_4.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_5.kt")
     public void testWith_non_public_markers_5() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_5.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_private_annotations.kt")
     public void testWith_non_public_markers_private_annotations() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.kt");
     }
 }

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

@@ -18,19 +18,19 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/util-klib-abi/testData/cinterop")
+@TestMetadata("compiler/testData/klib/dump-abi/cinterop")
 @TestDataPath("$PROJECT_ROOT")
 @Tag("frontend-fir")
 @FirPipeline()
 public class FirNativeCInteropLibraryAbiReaderTest extends AbstractNativeCInteropLibraryAbiReaderTest {
     @Test
     public void testAllFilesPresentInCinterop() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/cinterop"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/dump-abi/cinterop"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
     @Test
     @TestMetadata("interop_class_inheritor.kt")
     public void testInterop_class_inheritor() throws Exception {
-        runTest("compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.kt");
+        runTest("compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.kt");
     }
 }

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

@@ -19,151 +19,151 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/util-klib-abi/testData/content")
+@TestMetadata("compiler/testData/klib/dump-abi/content")
 @TestDataPath("$PROJECT_ROOT")
 @Tag("frontend-fir")
 @FirPipeline()
 public class FirNativeLibraryAbiReaderTest extends AbstractNativeLibraryAbiReaderTest {
     @Test
     public void testAllFilesPresentInContent() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/dump-abi/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
     }
 
     @Test
     @TestMetadata("callables.kt")
     public void testCallables() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/callables.kt");
+        runTest("compiler/testData/klib/dump-abi/content/callables.kt");
     }
 
     @Test
     @TestMetadata("classifiers.kt")
     public void testClassifiers() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/classifiers.kt");
+        runTest("compiler/testData/klib/dump-abi/content/classifiers.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_1.kt")
     public void testExcluded_classes_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_2.kt")
     public void testExcluded_classes_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_2.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_3.kt")
     public void testExcluded_classes_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_3.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_1.kt")
     public void testExcluded_packages_non_root_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_2.kt")
     public void testExcluded_packages_non_root_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_3.kt")
     public void testExcluded_packages_non_root_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_4.kt")
     public void testExcluded_packages_non_root_4() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_root_1.kt")
     public void testExcluded_packages_root_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_root_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_root_2.kt")
     public void testExcluded_packages_root_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_root_2.kt");
     }
 
     @Test
     @TestMetadata("inheritance.kt")
     public void testInheritance() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/inheritance.kt");
+        runTest("compiler/testData/klib/dump-abi/content/inheritance.kt");
     }
 
     @Test
     @TestMetadata("root_package.kt")
     public void testRoot_package() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/root_package.kt");
+        runTest("compiler/testData/klib/dump-abi/content/root_package.kt");
     }
 
     @Test
     @TestMetadata("specific_types_dnn.kt")
     public void testSpecific_types_dnn() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/specific_types_dnn.kt");
+        runTest("compiler/testData/klib/dump-abi/content/specific_types_dnn.kt");
     }
 
     @Test
     @TestMetadata("type_parameters.kt")
     public void testType_parameters() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/type_parameters.kt");
+        runTest("compiler/testData/klib/dump-abi/content/type_parameters.kt");
     }
 
     @Test
     @TestMetadata("value_parameters.kt")
     public void testValue_parameters() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/value_parameters.kt");
+        runTest("compiler/testData/klib/dump-abi/content/value_parameters.kt");
     }
 
     @Test
     @TestMetadata("visibilities.kt")
     public void testVisibilities() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/visibilities.kt");
+        runTest("compiler/testData/klib/dump-abi/content/visibilities.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_1.kt")
     public void testWith_non_public_markers_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_1.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_2.kt")
     public void testWith_non_public_markers_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_2.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_3.kt")
     public void testWith_non_public_markers_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_3.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_4.kt")
     public void testWith_non_public_markers_4() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_4.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_5.kt")
     public void testWith_non_public_markers_5() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_5.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_private_annotations.kt")
     public void testWith_non_public_markers_private_annotations() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.kt");
     }
 }

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

@@ -16,17 +16,17 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/util-klib-abi/testData/cinterop")
+@TestMetadata("compiler/testData/klib/dump-abi/cinterop")
 @TestDataPath("$PROJECT_ROOT")
 public class NativeCInteropLibraryAbiReaderTest extends AbstractNativeCInteropLibraryAbiReaderTest {
     @Test
     public void testAllFilesPresentInCinterop() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/cinterop"), Pattern.compile("^(.+)\\.kt$"), null, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/dump-abi/cinterop"), Pattern.compile("^(.+)\\.kt$"), null, true);
     }
 
     @Test
     @TestMetadata("interop_class_inheritor.kt")
     public void testInterop_class_inheritor() throws Exception {
-        runTest("compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.kt");
+        runTest("compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.kt");
     }
 }

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

@@ -17,149 +17,149 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateNativeTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/util-klib-abi/testData/content")
+@TestMetadata("compiler/testData/klib/dump-abi/content")
 @TestDataPath("$PROJECT_ROOT")
 public class NativeLibraryAbiReaderTest extends AbstractNativeLibraryAbiReaderTest {
     @Test
     public void testAllFilesPresentInContent() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/util-klib-abi/testData/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/dump-abi/content"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
     }
 
     @Test
     @TestMetadata("callables.kt")
     public void testCallables() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/callables.kt");
+        runTest("compiler/testData/klib/dump-abi/content/callables.kt");
     }
 
     @Test
     @TestMetadata("classifiers.kt")
     public void testClassifiers() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/classifiers.kt");
+        runTest("compiler/testData/klib/dump-abi/content/classifiers.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_1.kt")
     public void testExcluded_classes_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_2.kt")
     public void testExcluded_classes_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_2.kt");
     }
 
     @Test
     @TestMetadata("excluded_classes_3.kt")
     public void testExcluded_classes_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_classes_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_classes_3.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_1.kt")
     public void testExcluded_packages_non_root_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_2.kt")
     public void testExcluded_packages_non_root_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_3.kt")
     public void testExcluded_packages_non_root_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_non_root_4.kt")
     public void testExcluded_packages_non_root_4() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_root_1.kt")
     public void testExcluded_packages_root_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_root_1.kt");
     }
 
     @Test
     @TestMetadata("excluded_packages_root_2.kt")
     public void testExcluded_packages_root_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/excluded_packages_root_2.kt");
     }
 
     @Test
     @TestMetadata("inheritance.kt")
     public void testInheritance() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/inheritance.kt");
+        runTest("compiler/testData/klib/dump-abi/content/inheritance.kt");
     }
 
     @Test
     @TestMetadata("root_package.kt")
     public void testRoot_package() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/root_package.kt");
+        runTest("compiler/testData/klib/dump-abi/content/root_package.kt");
     }
 
     @Test
     @TestMetadata("specific_types_dnn.kt")
     public void testSpecific_types_dnn() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/specific_types_dnn.kt");
+        runTest("compiler/testData/klib/dump-abi/content/specific_types_dnn.kt");
     }
 
     @Test
     @TestMetadata("type_parameters.kt")
     public void testType_parameters() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/type_parameters.kt");
+        runTest("compiler/testData/klib/dump-abi/content/type_parameters.kt");
     }
 
     @Test
     @TestMetadata("value_parameters.kt")
     public void testValue_parameters() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/value_parameters.kt");
+        runTest("compiler/testData/klib/dump-abi/content/value_parameters.kt");
     }
 
     @Test
     @TestMetadata("visibilities.kt")
     public void testVisibilities() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/visibilities.kt");
+        runTest("compiler/testData/klib/dump-abi/content/visibilities.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_1.kt")
     public void testWith_non_public_markers_1() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_1.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_2.kt")
     public void testWith_non_public_markers_2() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_2.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_3.kt")
     public void testWith_non_public_markers_3() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_3.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_4.kt")
     public void testWith_non_public_markers_4() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_4.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_5.kt")
     public void testWith_non_public_markers_5() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_5.kt");
     }
 
     @Test
     @TestMetadata("with_non_public_markers_private_annotations.kt")
     public void testWith_non_public_markers_private_annotations() throws Exception {
-        runTest("compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt");
+        runTest("compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.kt");
     }
 }

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

@@ -278,14 +278,14 @@ fun main() {
         }
 
         generateTestGroupSuiteWithJUnit5 {
-            testGroup("native/native.tests/tests-gen", "compiler/util-klib-abi/testData") {
+            testGroup("native/native.tests/tests-gen", "compiler/testData/klib/dump-abi") {
                 testClass<AbstractNativeLibraryAbiReaderTest>(
                     suiteTestClassName = "NativeLibraryAbiReaderTest"
                 ) {
                     model("content", targetBackend = TargetBackend.NATIVE)
                 }
             }
-            testGroup("native/native.tests/tests-gen", "compiler/util-klib-abi/testData") {
+            testGroup("native/native.tests/tests-gen", "compiler/testData/klib/dump-abi") {
                 testClass<AbstractNativeLibraryAbiReaderTest>(
                     suiteTestClassName = "FirNativeLibraryAbiReaderTest",
                     annotations = listOf(
@@ -296,14 +296,14 @@ fun main() {
                 }
             }
 
-            testGroup("native/native.tests/tests-gen", "compiler/util-klib-abi/testData") {
+            testGroup("native/native.tests/tests-gen", "compiler/testData/klib/dump-abi") {
                 testClass<AbstractNativeCInteropLibraryAbiReaderTest>(
                     suiteTestClassName = "NativeCInteropLibraryAbiReaderTest"
                 ) {
                     model("cinterop")
                 }
             }
-            testGroup("native/native.tests/tests-gen", "compiler/util-klib-abi/testData") {
+            testGroup("native/native.tests/tests-gen", "compiler/testData/klib/dump-abi") {
                 testClass<AbstractNativeCInteropLibraryAbiReaderTest>(
                     suiteTestClassName = "FirNativeCInteropLibraryAbiReaderTest",
                     annotations = listOf(