diff --git a/.idea/kotlinTestDataPluginTestDataPaths.xml b/.idea/kotlinTestDataPluginTestDataPaths.xml
index e7ccb32ef8f..185427a034b 100644
--- a/.idea/kotlinTestDataPluginTestDataPaths.xml
+++ b/.idea/kotlinTestDataPluginTestDataPaths.xml
@@ -89,7 +89,6 @@
-
diff --git a/compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.def b/compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.def
similarity index 100%
rename from compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.def
rename to compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.def
diff --git a/compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.kt b/compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.kt
rename to compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.kt
diff --git a/compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.v1.txt b/compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.v1.txt
rename to compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.v1.txt
diff --git a/compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.v2.txt b/compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/cinterop/interop_class_inheritor.v2.txt
rename to compiler/testData/klib/dump-abi/cinterop/interop_class_inheritor.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/callables.kt b/compiler/testData/klib/dump-abi/content/callables.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/callables.kt
rename to compiler/testData/klib/dump-abi/content/callables.kt
diff --git a/compiler/util-klib-abi/testData/content/callables.v1.txt b/compiler/testData/klib/dump-abi/content/callables.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/callables.v1.txt
rename to compiler/testData/klib/dump-abi/content/callables.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/callables.v2.txt b/compiler/testData/klib/dump-abi/content/callables.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/callables.v2.txt
rename to compiler/testData/klib/dump-abi/content/callables.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/classifiers.kt b/compiler/testData/klib/dump-abi/content/classifiers.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/classifiers.kt
rename to compiler/testData/klib/dump-abi/content/classifiers.kt
diff --git a/compiler/util-klib-abi/testData/content/classifiers.v1.txt b/compiler/testData/klib/dump-abi/content/classifiers.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/classifiers.v1.txt
rename to compiler/testData/klib/dump-abi/content/classifiers.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/classifiers.v2.txt b/compiler/testData/klib/dump-abi/content/classifiers.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/classifiers.v2.txt
rename to compiler/testData/klib/dump-abi/content/classifiers.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_1.kt b/compiler/testData/klib/dump-abi/content/excluded_classes_1.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_1.kt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_1.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_1.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_classes_1.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_1.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_1.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_1.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_classes_1.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_1.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_1.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_2.kt b/compiler/testData/klib/dump-abi/content/excluded_classes_2.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_2.kt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_2.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_2.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_classes_2.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_2.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_2.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_2.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_classes_2.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_2.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_2.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_3.kt b/compiler/testData/klib/dump-abi/content/excluded_classes_3.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_3.kt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_3.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_3.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_classes_3.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_3.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_3.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_classes_3.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_classes_3.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_classes_3.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_classes_3.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.kt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_1.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_1.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.kt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_2.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_2.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.kt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_3.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_3.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.kt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_non_root_4.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_non_root_4.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt b/compiler/testData/klib/dump-abi/content/excluded_packages_root_1.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_root_1.kt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_root_1.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_root_1.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_root_1.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_root_1.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_1.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_root_1.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_root_1.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_root_1.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt b/compiler/testData/klib/dump-abi/content/excluded_packages_root_2.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_root_2.kt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_root_2.kt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v1.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_root_2.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_root_2.v1.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_root_2.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/excluded_packages_root_2.v2.txt b/compiler/testData/klib/dump-abi/content/excluded_packages_root_2.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/excluded_packages_root_2.v2.txt
rename to compiler/testData/klib/dump-abi/content/excluded_packages_root_2.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/inheritance.kt b/compiler/testData/klib/dump-abi/content/inheritance.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/inheritance.kt
rename to compiler/testData/klib/dump-abi/content/inheritance.kt
diff --git a/compiler/util-klib-abi/testData/content/inheritance.v1.txt b/compiler/testData/klib/dump-abi/content/inheritance.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/inheritance.v1.txt
rename to compiler/testData/klib/dump-abi/content/inheritance.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/inheritance.v2.txt b/compiler/testData/klib/dump-abi/content/inheritance.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/inheritance.v2.txt
rename to compiler/testData/klib/dump-abi/content/inheritance.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/root_package.kt b/compiler/testData/klib/dump-abi/content/root_package.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/root_package.kt
rename to compiler/testData/klib/dump-abi/content/root_package.kt
diff --git a/compiler/util-klib-abi/testData/content/root_package.v1.txt b/compiler/testData/klib/dump-abi/content/root_package.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/root_package.v1.txt
rename to compiler/testData/klib/dump-abi/content/root_package.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/root_package.v2.txt b/compiler/testData/klib/dump-abi/content/root_package.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/root_package.v2.txt
rename to compiler/testData/klib/dump-abi/content/root_package.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/specific_types_dnn.kt b/compiler/testData/klib/dump-abi/content/specific_types_dnn.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/specific_types_dnn.kt
rename to compiler/testData/klib/dump-abi/content/specific_types_dnn.kt
diff --git a/compiler/util-klib-abi/testData/content/specific_types_dnn.v1.txt b/compiler/testData/klib/dump-abi/content/specific_types_dnn.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/specific_types_dnn.v1.txt
rename to compiler/testData/klib/dump-abi/content/specific_types_dnn.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/specific_types_dnn.v2.txt b/compiler/testData/klib/dump-abi/content/specific_types_dnn.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/specific_types_dnn.v2.txt
rename to compiler/testData/klib/dump-abi/content/specific_types_dnn.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/specific_types_dynamic.kt b/compiler/testData/klib/dump-abi/content/specific_types_dynamic.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/specific_types_dynamic.kt
rename to compiler/testData/klib/dump-abi/content/specific_types_dynamic.kt
diff --git a/compiler/util-klib-abi/testData/content/specific_types_dynamic.v1.txt b/compiler/testData/klib/dump-abi/content/specific_types_dynamic.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/specific_types_dynamic.v1.txt
rename to compiler/testData/klib/dump-abi/content/specific_types_dynamic.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/specific_types_dynamic.v2.txt b/compiler/testData/klib/dump-abi/content/specific_types_dynamic.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/specific_types_dynamic.v2.txt
rename to compiler/testData/klib/dump-abi/content/specific_types_dynamic.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/type_parameters.kt b/compiler/testData/klib/dump-abi/content/type_parameters.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/type_parameters.kt
rename to compiler/testData/klib/dump-abi/content/type_parameters.kt
diff --git a/compiler/util-klib-abi/testData/content/type_parameters.v1.txt b/compiler/testData/klib/dump-abi/content/type_parameters.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/type_parameters.v1.txt
rename to compiler/testData/klib/dump-abi/content/type_parameters.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/type_parameters.v2.txt b/compiler/testData/klib/dump-abi/content/type_parameters.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/type_parameters.v2.txt
rename to compiler/testData/klib/dump-abi/content/type_parameters.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/value_parameters.kt b/compiler/testData/klib/dump-abi/content/value_parameters.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/value_parameters.kt
rename to compiler/testData/klib/dump-abi/content/value_parameters.kt
diff --git a/compiler/util-klib-abi/testData/content/value_parameters.v1.txt b/compiler/testData/klib/dump-abi/content/value_parameters.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/value_parameters.v1.txt
rename to compiler/testData/klib/dump-abi/content/value_parameters.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/value_parameters.v2.txt b/compiler/testData/klib/dump-abi/content/value_parameters.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/value_parameters.v2.txt
rename to compiler/testData/klib/dump-abi/content/value_parameters.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/visibilities.kt b/compiler/testData/klib/dump-abi/content/visibilities.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/visibilities.kt
rename to compiler/testData/klib/dump-abi/content/visibilities.kt
diff --git a/compiler/util-klib-abi/testData/content/visibilities.v1.txt b/compiler/testData/klib/dump-abi/content/visibilities.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/visibilities.v1.txt
rename to compiler/testData/klib/dump-abi/content/visibilities.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/visibilities.v2.txt b/compiler/testData/klib/dump-abi/content/visibilities.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/visibilities.v2.txt
rename to compiler/testData/klib/dump-abi/content/visibilities.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_1.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_1.kt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_1.kt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v1.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_1.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_1.v1.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_1.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_1.v2.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_1.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_1.v2.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_1.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_2.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_2.kt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_2.kt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v1.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_2.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_2.v1.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_2.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_2.v2.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_2.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_2.v2.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_2.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_3.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_3.kt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_3.kt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v1.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_3.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_3.v1.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_3.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_3.v2.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_3.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_3.v2.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_3.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_4.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_4.kt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_4.kt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v1.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_4.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_4.v1.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_4.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_4.v2.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_4.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_4.v2.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_4.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_5.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_5.kt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_5.kt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v1.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_5.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_5.v1.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_5.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_5.v2.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_5.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_5.v2.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_5.v2.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.kt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.kt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.kt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v1.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.v1.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v1.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.v1.txt
diff --git a/compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v2.txt b/compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.v2.txt
similarity index 100%
rename from compiler/util-klib-abi/testData/content/with_non_public_markers_private_annotations.v2.txt
rename to compiler/testData/klib/dump-abi/content/with_non_public_markers_private_annotations.v2.txt
diff --git a/compiler/util-klib-abi/build.gradle.kts b/compiler/util-klib-abi/build.gradle.kts
index d77466e40d4..dd66bfe404d 100644
--- a/compiler/util-klib-abi/build.gradle.kts
+++ b/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)
diff --git a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/GenerateLibraryAbiReaderTests.kt b/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/GenerateLibraryAbiReaderTests.kt
index b86761cecad..cd8825b8112 100644
--- a/compiler/util-klib-abi/test/org/jetbrains/kotlin/library/abi/GenerateLibraryAbiReaderTests.kt
+++ b/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 {
model("content")
}
diff --git a/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/ClassicJsLibraryAbiReaderTestGenerated.java b/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/ClassicJsLibraryAbiReaderTestGenerated.java
index dea04f7cbd1..6e96736edb4 100644
--- a/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/ClassicJsLibraryAbiReaderTestGenerated.java
+++ b/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");
}
}
diff --git a/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/FirJsLibraryAbiReaderTestGenerated.java b/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/FirJsLibraryAbiReaderTestGenerated.java
index d00befdc766..d64b695c0b6 100644
--- a/compiler/util-klib-abi/tests-gen/org/jetbrains/kotlin/library/abi/FirJsLibraryAbiReaderTestGenerated.java
+++ b/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");
}
}
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCInteropLibraryAbiReaderTest.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCInteropLibraryAbiReaderTest.java
index 4101506bba0..45840982c0f 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCInteropLibraryAbiReaderTest.java
+++ b/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");
}
}
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeLibraryAbiReaderTest.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeLibraryAbiReaderTest.java
index 9e54718e26b..6e6913984c1 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeLibraryAbiReaderTest.java
+++ b/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");
}
}
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCInteropLibraryAbiReaderTest.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCInteropLibraryAbiReaderTest.java
index c91c3b06a37..dcaa6ae3004 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCInteropLibraryAbiReaderTest.java
+++ b/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");
}
}
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeLibraryAbiReaderTest.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeLibraryAbiReaderTest.java
index 467a88b86ae..6a50cc8736e 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeLibraryAbiReaderTest.java
+++ b/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");
}
}
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 a46b3051f62..3ce72e81106 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
@@ -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(
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(
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(
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(
suiteTestClassName = "FirNativeCInteropLibraryAbiReaderTest",
annotations = listOf(