[KLIB][tests] Keep "klib evolution" test data under "testData/klib/" dir

js/js.tests/test/org/jetbrains/kotlin/generators/tests/GenerateJsTests.kt

@@ -37,12 +37,12 @@ fun main(args: Array<String>) {
             }
         }
 
-        testGroup("js/js.tests/tests-gen", "compiler/testData/binaryCompatibility", testRunnerMethodName = "runTest0") {
+        testGroup("js/js.tests/tests-gen", "compiler/testData", testRunnerMethodName = "runTest0") {
             testClass<AbstractClassicJsKlibEvolutionTest> {
-                model("klibEvolution", targetBackend = TargetBackend.JS_IR)
+                model("klib/evolution", targetBackend = TargetBackend.JS_IR)
             }
             testClass<AbstractFirJsKlibEvolutionTest> {
-                model("klibEvolution", targetBackend = TargetBackend.JS_IR)
+                model("klib/evolution", targetBackend = TargetBackend.JS_IR)
             }
         }
     }

js/js.tests/test/org/jetbrains/kotlin/js/testOld/klib/AbstractJsKlibEvolutionTest.kt

@@ -15,7 +15,6 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.js.testOld.V8JsTestChecker
-import org.jetbrains.kotlin.js.testOld.klib.AbstractJsKlibEvolutionTest.Companion.klib
 import org.jetbrains.kotlin.library.KLIB_FILE_EXTENSION
 import org.jetbrains.kotlin.test.Directives
 import org.jetbrains.kotlin.test.KotlinBaseTest

js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/ClassicJsKlibEvolutionTestGenerated.java

@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/binaryCompatibility/klibEvolution")
+@TestMetadata("compiler/testData/klib/evolution")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class ClassicJsKlibEvolutionTestGenerated extends AbstractClassicJsKlibEvolutionTest {
@@ -28,200 +28,200 @@ public class ClassicJsKlibEvolutionTestGenerated extends AbstractClassicJsKlibEv
 
     @TestMetadata("addAbstractMemberBody.kt")
     public void testAddAbstractMemberBody() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt");
+        runTest("compiler/testData/klib/evolution/addAbstractMemberBody.kt");
     }
 
     @TestMetadata("addCompanionObject.kt")
     public void testAddCompanionObject() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt");
+        runTest("compiler/testData/klib/evolution/addCompanionObject.kt");
     }
 
     @TestMetadata("addDefaultImplementations.kt")
     public void testAddDefaultImplementations() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt");
+        runTest("compiler/testData/klib/evolution/addDefaultImplementations.kt");
     }
 
     @TestMetadata("addEnumClassMember.kt")
     public void testAddEnumClassMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt");
+        runTest("compiler/testData/klib/evolution/addEnumClassMember.kt");
     }
 
     @TestMetadata("addLateinitToVar.kt")
     public void testAddLateinitToVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt");
+        runTest("compiler/testData/klib/evolution/addLateinitToVar.kt");
     }
 
     @TestMetadata("addOpenToClass.kt")
     public void testAddOpenToClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt");
+        runTest("compiler/testData/klib/evolution/addOpenToClass.kt");
     }
 
     @TestMetadata("addOpenToMember.kt")
     public void testAddOpenToMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt");
+        runTest("compiler/testData/klib/evolution/addOpenToMember.kt");
     }
 
     @TestMetadata("addOrRemoveConst.kt")
     public void testAddOrRemoveConst() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt");
+        runTest("compiler/testData/klib/evolution/addOrRemoveConst.kt");
     }
 
     @TestMetadata("addOrRemoveInitBlock.kt")
     public void testAddOrRemoveInitBlock() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt");
+        runTest("compiler/testData/klib/evolution/addOrRemoveInitBlock.kt");
     }
 
     @TestMetadata("addOverloads.kt")
     public void testAddOverloads() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt");
+        runTest("compiler/testData/klib/evolution/addOverloads.kt");
     }
 
     @TestMetadata("addParameterDefaulValue.kt")
     public void testAddParameterDefaulValue() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt");
+        runTest("compiler/testData/klib/evolution/addParameterDefaulValue.kt");
     }
 
     @TestMetadata("addPropertyAccessor.kt")
     public void testAddPropertyAccessor() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt");
+        runTest("compiler/testData/klib/evolution/addPropertyAccessor.kt");
     }
 
     @TestMetadata("addingSealedClassMember.kt")
     public void testAddingSealedClassMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt");
+        runTest("compiler/testData/klib/evolution/addingSealedClassMember.kt");
     }
 
-    public void testAllFilesPresentInKlibEvolution() throws Exception {
+    public void testAllFilesPresentInEvolution() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/binaryCompatibility/klibEvolution"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/evolution"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
     }
 
     @TestMetadata("changeBaseClassOrder.kt")
     public void testChangeBaseClassOrder() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt");
+        runTest("compiler/testData/klib/evolution/changeBaseClassOrder.kt");
     }
 
     @TestMetadata("changeCompanionToNestedObject.kt")
     public void testChangeCompanionToNestedObject() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt");
+        runTest("compiler/testData/klib/evolution/changeCompanionToNestedObject.kt");
     }
 
     @TestMetadata("changeConstInitialization.kt")
     public void testChangeConstInitialization() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt");
+        runTest("compiler/testData/klib/evolution/changeConstInitialization.kt");
     }
 
     @TestMetadata("changeNamesOfTypeParameters.kt")
     public void testChangeNamesOfTypeParameters() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt");
+        runTest("compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt");
     }
 
     @TestMetadata("changeObjectToCompanion.kt")
     public void testChangeObjectToCompanion() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt");
+        runTest("compiler/testData/klib/evolution/changeObjectToCompanion.kt");
     }
 
     @TestMetadata("changeParameterDefaultValue.kt")
     public void testChangeParameterDefaultValue() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt");
+        runTest("compiler/testData/klib/evolution/changeParameterDefaultValue.kt");
     }
 
     @TestMetadata("changePropertyFromValToVar.kt")
     public void testChangePropertyFromValToVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt");
+        runTest("compiler/testData/klib/evolution/changePropertyFromValToVar.kt");
     }
 
     @TestMetadata("changePropertyInitialization.kt")
     public void testChangePropertyInitialization() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt");
+        runTest("compiler/testData/klib/evolution/changePropertyInitialization.kt");
     }
 
     @TestMetadata("constructorParameterMarkValVar.kt")
     public void testConstructorParameterMarkValVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt");
+        runTest("compiler/testData/klib/evolution/constructorParameterMarkValVar.kt");
     }
 
     @TestMetadata("deleteOverrideMember.kt")
     public void testDeleteOverrideMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt");
+        runTest("compiler/testData/klib/evolution/deleteOverrideMember.kt");
     }
 
     @TestMetadata("deletePrivateMembers.kt")
     public void testDeletePrivateMembers() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt");
+        runTest("compiler/testData/klib/evolution/deletePrivateMembers.kt");
     }
 
     @TestMetadata("inlineBodyChange.kt")
     public void testInlineBodyChange() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt");
+        runTest("compiler/testData/klib/evolution/inlineBodyChange.kt");
     }
 
     @TestMetadata("inlineFunction.kt")
     public void testInlineFunction() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt");
+        runTest("compiler/testData/klib/evolution/inlineFunction.kt");
     }
 
     @TestMetadata("makeFunctionInfixOrTailrec.kt")
     public void testMakeFunctionInfixOrTailrec() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt");
+        runTest("compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt");
     }
 
     @TestMetadata("moreSpecificBaseClass.kt")
     public void testMoreSpecificBaseClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt");
+        runTest("compiler/testData/klib/evolution/moreSpecificBaseClass.kt");
     }
 
     @TestMetadata("moveMemberUpInHierarchy.kt")
     public void testMoveMemberUpInHierarchy() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt");
+        runTest("compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt");
     }
 
     @TestMetadata("newFakeOverride.kt")
     public void testNewFakeOverride() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt");
+        runTest("compiler/testData/klib/evolution/newFakeOverride.kt");
     }
 
     @TestMetadata("newOverrideMember.kt")
     public void testNewOverrideMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt");
+        runTest("compiler/testData/klib/evolution/newOverrideMember.kt");
     }
 
     @TestMetadata("removeAbstractFromClass.kt")
     public void testRemoveAbstractFromClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt");
+        runTest("compiler/testData/klib/evolution/removeAbstractFromClass.kt");
     }
 
     @TestMetadata("removeInfixOrTailrecFromFunction.kt")
     public void testRemoveInfixOrTailrecFromFunction() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt");
+        runTest("compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt");
     }
 
     @TestMetadata("removeLateinitFromVar.kt")
     public void testRemoveLateinitFromVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt");
+        runTest("compiler/testData/klib/evolution/removeLateinitFromVar.kt");
     }
 
     @TestMetadata("removePropertyAccessor.kt")
     public void testRemovePropertyAccessor() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt");
+        runTest("compiler/testData/klib/evolution/removePropertyAccessor.kt");
     }
 
     @TestMetadata("renameArguments.kt")
     public void testRenameArguments() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt");
+        runTest("compiler/testData/klib/evolution/renameArguments.kt");
     }
 
     @TestMetadata("reorderClassConstructors.kt")
     public void testReorderClassConstructors() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt");
+        runTest("compiler/testData/klib/evolution/reorderClassConstructors.kt");
     }
 
     @TestMetadata("turnClassIntoDataClass.kt")
     public void testTurnClassIntoDataClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt");
+        runTest("compiler/testData/klib/evolution/turnClassIntoDataClass.kt");
     }
 
     @TestMetadata("widenSuperMemberVisibility.kt")
     public void testWidenSuperMemberVisibility() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt");
+        runTest("compiler/testData/klib/evolution/widenSuperMemberVisibility.kt");
     }
 }

js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/klib/FirJsKlibEvolutionTestGenerated.java

@@ -18,7 +18,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.GenerateJsTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@TestMetadata("compiler/testData/binaryCompatibility/klibEvolution")
+@TestMetadata("compiler/testData/klib/evolution")
 @TestDataPath("$PROJECT_ROOT")
 @RunWith(JUnit3RunnerWithInners.class)
 public class FirJsKlibEvolutionTestGenerated extends AbstractFirJsKlibEvolutionTest {
@@ -28,200 +28,200 @@ public class FirJsKlibEvolutionTestGenerated extends AbstractFirJsKlibEvolutionT
 
     @TestMetadata("addAbstractMemberBody.kt")
     public void testAddAbstractMemberBody() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt");
+        runTest("compiler/testData/klib/evolution/addAbstractMemberBody.kt");
     }
 
     @TestMetadata("addCompanionObject.kt")
     public void testAddCompanionObject() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt");
+        runTest("compiler/testData/klib/evolution/addCompanionObject.kt");
     }
 
     @TestMetadata("addDefaultImplementations.kt")
     public void testAddDefaultImplementations() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt");
+        runTest("compiler/testData/klib/evolution/addDefaultImplementations.kt");
     }
 
     @TestMetadata("addEnumClassMember.kt")
     public void testAddEnumClassMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt");
+        runTest("compiler/testData/klib/evolution/addEnumClassMember.kt");
     }
 
     @TestMetadata("addLateinitToVar.kt")
     public void testAddLateinitToVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt");
+        runTest("compiler/testData/klib/evolution/addLateinitToVar.kt");
     }
 
     @TestMetadata("addOpenToClass.kt")
     public void testAddOpenToClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt");
+        runTest("compiler/testData/klib/evolution/addOpenToClass.kt");
     }
 
     @TestMetadata("addOpenToMember.kt")
     public void testAddOpenToMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt");
+        runTest("compiler/testData/klib/evolution/addOpenToMember.kt");
     }
 
     @TestMetadata("addOrRemoveConst.kt")
     public void testAddOrRemoveConst() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt");
+        runTest("compiler/testData/klib/evolution/addOrRemoveConst.kt");
     }
 
     @TestMetadata("addOrRemoveInitBlock.kt")
     public void testAddOrRemoveInitBlock() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt");
+        runTest("compiler/testData/klib/evolution/addOrRemoveInitBlock.kt");
     }
 
     @TestMetadata("addOverloads.kt")
     public void testAddOverloads() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt");
+        runTest("compiler/testData/klib/evolution/addOverloads.kt");
     }
 
     @TestMetadata("addParameterDefaulValue.kt")
     public void testAddParameterDefaulValue() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt");
+        runTest("compiler/testData/klib/evolution/addParameterDefaulValue.kt");
     }
 
     @TestMetadata("addPropertyAccessor.kt")
     public void testAddPropertyAccessor() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt");
+        runTest("compiler/testData/klib/evolution/addPropertyAccessor.kt");
     }
 
     @TestMetadata("addingSealedClassMember.kt")
     public void testAddingSealedClassMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt");
+        runTest("compiler/testData/klib/evolution/addingSealedClassMember.kt");
     }
 
-    public void testAllFilesPresentInKlibEvolution() throws Exception {
+    public void testAllFilesPresentInEvolution() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/binaryCompatibility/klibEvolution"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/evolution"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
     }
 
     @TestMetadata("changeBaseClassOrder.kt")
     public void testChangeBaseClassOrder() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt");
+        runTest("compiler/testData/klib/evolution/changeBaseClassOrder.kt");
     }
 
     @TestMetadata("changeCompanionToNestedObject.kt")
     public void testChangeCompanionToNestedObject() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt");
+        runTest("compiler/testData/klib/evolution/changeCompanionToNestedObject.kt");
     }
 
     @TestMetadata("changeConstInitialization.kt")
     public void testChangeConstInitialization() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt");
+        runTest("compiler/testData/klib/evolution/changeConstInitialization.kt");
     }
 
     @TestMetadata("changeNamesOfTypeParameters.kt")
     public void testChangeNamesOfTypeParameters() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt");
+        runTest("compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt");
     }
 
     @TestMetadata("changeObjectToCompanion.kt")
     public void testChangeObjectToCompanion() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt");
+        runTest("compiler/testData/klib/evolution/changeObjectToCompanion.kt");
     }
 
     @TestMetadata("changeParameterDefaultValue.kt")
     public void testChangeParameterDefaultValue() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt");
+        runTest("compiler/testData/klib/evolution/changeParameterDefaultValue.kt");
     }
 
     @TestMetadata("changePropertyFromValToVar.kt")
     public void testChangePropertyFromValToVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt");
+        runTest("compiler/testData/klib/evolution/changePropertyFromValToVar.kt");
     }
 
     @TestMetadata("changePropertyInitialization.kt")
     public void testChangePropertyInitialization() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt");
+        runTest("compiler/testData/klib/evolution/changePropertyInitialization.kt");
     }
 
     @TestMetadata("constructorParameterMarkValVar.kt")
     public void testConstructorParameterMarkValVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt");
+        runTest("compiler/testData/klib/evolution/constructorParameterMarkValVar.kt");
     }
 
     @TestMetadata("deleteOverrideMember.kt")
     public void testDeleteOverrideMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt");
+        runTest("compiler/testData/klib/evolution/deleteOverrideMember.kt");
     }
 
     @TestMetadata("deletePrivateMembers.kt")
     public void testDeletePrivateMembers() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt");
+        runTest("compiler/testData/klib/evolution/deletePrivateMembers.kt");
     }
 
     @TestMetadata("inlineBodyChange.kt")
     public void testInlineBodyChange() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt");
+        runTest("compiler/testData/klib/evolution/inlineBodyChange.kt");
     }
 
     @TestMetadata("inlineFunction.kt")
     public void testInlineFunction() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt");
+        runTest("compiler/testData/klib/evolution/inlineFunction.kt");
     }
 
     @TestMetadata("makeFunctionInfixOrTailrec.kt")
     public void testMakeFunctionInfixOrTailrec() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt");
+        runTest("compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt");
     }
 
     @TestMetadata("moreSpecificBaseClass.kt")
     public void testMoreSpecificBaseClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt");
+        runTest("compiler/testData/klib/evolution/moreSpecificBaseClass.kt");
     }
 
     @TestMetadata("moveMemberUpInHierarchy.kt")
     public void testMoveMemberUpInHierarchy() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt");
+        runTest("compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt");
     }
 
     @TestMetadata("newFakeOverride.kt")
     public void testNewFakeOverride() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt");
+        runTest("compiler/testData/klib/evolution/newFakeOverride.kt");
     }
 
     @TestMetadata("newOverrideMember.kt")
     public void testNewOverrideMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt");
+        runTest("compiler/testData/klib/evolution/newOverrideMember.kt");
     }
 
     @TestMetadata("removeAbstractFromClass.kt")
     public void testRemoveAbstractFromClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt");
+        runTest("compiler/testData/klib/evolution/removeAbstractFromClass.kt");
     }
 
     @TestMetadata("removeInfixOrTailrecFromFunction.kt")
     public void testRemoveInfixOrTailrecFromFunction() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt");
+        runTest("compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt");
     }
 
     @TestMetadata("removeLateinitFromVar.kt")
     public void testRemoveLateinitFromVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt");
+        runTest("compiler/testData/klib/evolution/removeLateinitFromVar.kt");
     }
 
     @TestMetadata("removePropertyAccessor.kt")
     public void testRemovePropertyAccessor() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt");
+        runTest("compiler/testData/klib/evolution/removePropertyAccessor.kt");
     }
 
     @TestMetadata("renameArguments.kt")
     public void testRenameArguments() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt");
+        runTest("compiler/testData/klib/evolution/renameArguments.kt");
     }
 
     @TestMetadata("reorderClassConstructors.kt")
     public void testReorderClassConstructors() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt");
+        runTest("compiler/testData/klib/evolution/reorderClassConstructors.kt");
     }
 
     @TestMetadata("turnClassIntoDataClass.kt")
     public void testTurnClassIntoDataClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt");
+        runTest("compiler/testData/klib/evolution/turnClassIntoDataClass.kt");
     }
 
     @TestMetadata("widenSuperMemberVisibility.kt")
     public void testWidenSuperMemberVisibility() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt");
+        runTest("compiler/testData/klib/evolution/widenSuperMemberVisibility.kt");
     }
 }

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

@@ -18,7 +18,7 @@ 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/testData/binaryCompatibility/klibEvolution")
+@TestMetadata("compiler/testData/klib/evolution")
 @TestDataPath("$PROJECT_ROOT")
 @Tag("frontend-fir")
 @FirPipeline()
@@ -26,239 +26,239 @@ public class FirNativeKlibEvolutionTestGenerated extends AbstractNativeKlibEvolu
     @Test
     @TestMetadata("addAbstractMemberBody.kt")
     public void testAddAbstractMemberBody() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt");
+        runTest("compiler/testData/klib/evolution/addAbstractMemberBody.kt");
     }
 
     @Test
     @TestMetadata("addCompanionObject.kt")
     public void testAddCompanionObject() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt");
+        runTest("compiler/testData/klib/evolution/addCompanionObject.kt");
     }
 
     @Test
     @TestMetadata("addDefaultImplementations.kt")
     public void testAddDefaultImplementations() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt");
+        runTest("compiler/testData/klib/evolution/addDefaultImplementations.kt");
     }
 
     @Test
     @TestMetadata("addEnumClassMember.kt")
     public void testAddEnumClassMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt");
+        runTest("compiler/testData/klib/evolution/addEnumClassMember.kt");
     }
 
     @Test
     @TestMetadata("addLateinitToVar.kt")
     public void testAddLateinitToVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt");
+        runTest("compiler/testData/klib/evolution/addLateinitToVar.kt");
     }
 
     @Test
     @TestMetadata("addOpenToClass.kt")
     public void testAddOpenToClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt");
+        runTest("compiler/testData/klib/evolution/addOpenToClass.kt");
     }
 
     @Test
     @TestMetadata("addOpenToMember.kt")
     public void testAddOpenToMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt");
+        runTest("compiler/testData/klib/evolution/addOpenToMember.kt");
     }
 
     @Test
     @TestMetadata("addOrRemoveConst.kt")
     public void testAddOrRemoveConst() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt");
+        runTest("compiler/testData/klib/evolution/addOrRemoveConst.kt");
     }
 
     @Test
     @TestMetadata("addOrRemoveInitBlock.kt")
     public void testAddOrRemoveInitBlock() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt");
+        runTest("compiler/testData/klib/evolution/addOrRemoveInitBlock.kt");
     }
 
     @Test
     @TestMetadata("addOverloads.kt")
     public void testAddOverloads() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt");
+        runTest("compiler/testData/klib/evolution/addOverloads.kt");
     }
 
     @Test
     @TestMetadata("addParameterDefaulValue.kt")
     public void testAddParameterDefaulValue() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt");
+        runTest("compiler/testData/klib/evolution/addParameterDefaulValue.kt");
     }
 
     @Test
     @TestMetadata("addPropertyAccessor.kt")
     public void testAddPropertyAccessor() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt");
+        runTest("compiler/testData/klib/evolution/addPropertyAccessor.kt");
     }
 
     @Test
     @TestMetadata("addingSealedClassMember.kt")
     public void testAddingSealedClassMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt");
+        runTest("compiler/testData/klib/evolution/addingSealedClassMember.kt");
     }
 
     @Test
-    public void testAllFilesPresentInKlibEvolution() throws Exception {
+    public void testAllFilesPresentInEvolution() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/binaryCompatibility/klibEvolution"), Pattern.compile("^(.+)\\.kt$"), null, false);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/evolution"), Pattern.compile("^(.+)\\.kt$"), null, false);
     }
 
     @Test
     @TestMetadata("changeBaseClassOrder.kt")
     public void testChangeBaseClassOrder() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt");
+        runTest("compiler/testData/klib/evolution/changeBaseClassOrder.kt");
     }
 
     @Test
     @TestMetadata("changeCompanionToNestedObject.kt")
     public void testChangeCompanionToNestedObject() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt");
+        runTest("compiler/testData/klib/evolution/changeCompanionToNestedObject.kt");
     }
 
     @Test
     @TestMetadata("changeConstInitialization.kt")
     public void testChangeConstInitialization() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt");
+        runTest("compiler/testData/klib/evolution/changeConstInitialization.kt");
     }
 
     @Test
     @TestMetadata("changeNamesOfTypeParameters.kt")
     public void testChangeNamesOfTypeParameters() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt");
+        runTest("compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt");
     }
 
     @Test
     @TestMetadata("changeObjectToCompanion.kt")
     public void testChangeObjectToCompanion() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt");
+        runTest("compiler/testData/klib/evolution/changeObjectToCompanion.kt");
     }
 
     @Test
     @TestMetadata("changeParameterDefaultValue.kt")
     public void testChangeParameterDefaultValue() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt");
+        runTest("compiler/testData/klib/evolution/changeParameterDefaultValue.kt");
     }
 
     @Test
     @TestMetadata("changePropertyFromValToVar.kt")
     public void testChangePropertyFromValToVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt");
+        runTest("compiler/testData/klib/evolution/changePropertyFromValToVar.kt");
     }
 
     @Test
     @TestMetadata("changePropertyInitialization.kt")
     public void testChangePropertyInitialization() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt");
+        runTest("compiler/testData/klib/evolution/changePropertyInitialization.kt");
     }
 
     @Test
     @TestMetadata("constructorParameterMarkValVar.kt")
     public void testConstructorParameterMarkValVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt");
+        runTest("compiler/testData/klib/evolution/constructorParameterMarkValVar.kt");
     }
 
     @Test
     @TestMetadata("deleteOverrideMember.kt")
     public void testDeleteOverrideMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt");
+        runTest("compiler/testData/klib/evolution/deleteOverrideMember.kt");
     }
 
     @Test
     @TestMetadata("deletePrivateMembers.kt")
     public void testDeletePrivateMembers() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt");
+        runTest("compiler/testData/klib/evolution/deletePrivateMembers.kt");
     }
 
     @Test
     @TestMetadata("inlineBodyChange.kt")
     public void testInlineBodyChange() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt");
+        runTest("compiler/testData/klib/evolution/inlineBodyChange.kt");
     }
 
     @Test
     @TestMetadata("inlineFunction.kt")
     public void testInlineFunction() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt");
+        runTest("compiler/testData/klib/evolution/inlineFunction.kt");
     }
 
     @Test
     @TestMetadata("makeFunctionInfixOrTailrec.kt")
     public void testMakeFunctionInfixOrTailrec() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt");
+        runTest("compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt");
     }
 
     @Test
     @TestMetadata("moreSpecificBaseClass.kt")
     public void testMoreSpecificBaseClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt");
+        runTest("compiler/testData/klib/evolution/moreSpecificBaseClass.kt");
     }
 
     @Test
     @TestMetadata("moveMemberUpInHierarchy.kt")
     public void testMoveMemberUpInHierarchy() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt");
+        runTest("compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt");
     }
 
     @Test
     @TestMetadata("newFakeOverride.kt")
     public void testNewFakeOverride() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt");
+        runTest("compiler/testData/klib/evolution/newFakeOverride.kt");
     }
 
     @Test
     @TestMetadata("newOverrideMember.kt")
     public void testNewOverrideMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt");
+        runTest("compiler/testData/klib/evolution/newOverrideMember.kt");
     }
 
     @Test
     @TestMetadata("removeAbstractFromClass.kt")
     public void testRemoveAbstractFromClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt");
+        runTest("compiler/testData/klib/evolution/removeAbstractFromClass.kt");
     }
 
     @Test
     @TestMetadata("removeInfixOrTailrecFromFunction.kt")
     public void testRemoveInfixOrTailrecFromFunction() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt");
+        runTest("compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt");
     }
 
     @Test
     @TestMetadata("removeLateinitFromVar.kt")
     public void testRemoveLateinitFromVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt");
+        runTest("compiler/testData/klib/evolution/removeLateinitFromVar.kt");
     }
 
     @Test
     @TestMetadata("removePropertyAccessor.kt")
     public void testRemovePropertyAccessor() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt");
+        runTest("compiler/testData/klib/evolution/removePropertyAccessor.kt");
     }
 
     @Test
     @TestMetadata("renameArguments.kt")
     public void testRenameArguments() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt");
+        runTest("compiler/testData/klib/evolution/renameArguments.kt");
     }
 
     @Test
     @TestMetadata("reorderClassConstructors.kt")
     public void testReorderClassConstructors() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt");
+        runTest("compiler/testData/klib/evolution/reorderClassConstructors.kt");
     }
 
     @Test
     @TestMetadata("turnClassIntoDataClass.kt")
     public void testTurnClassIntoDataClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt");
+        runTest("compiler/testData/klib/evolution/turnClassIntoDataClass.kt");
     }
 
     @Test
     @TestMetadata("widenSuperMemberVisibility.kt")
     public void testWidenSuperMemberVisibility() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt");
+        runTest("compiler/testData/klib/evolution/widenSuperMemberVisibility.kt");
     }
 }

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

@@ -16,245 +16,245 @@ 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/testData/binaryCompatibility/klibEvolution")
+@TestMetadata("compiler/testData/klib/evolution")
 @TestDataPath("$PROJECT_ROOT")
 public class NativeKlibEvolutionTestGenerated extends AbstractNativeKlibEvolutionTest {
     @Test
     @TestMetadata("addAbstractMemberBody.kt")
     public void testAddAbstractMemberBody() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addAbstractMemberBody.kt");
+        runTest("compiler/testData/klib/evolution/addAbstractMemberBody.kt");
     }
 
     @Test
     @TestMetadata("addCompanionObject.kt")
     public void testAddCompanionObject() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addCompanionObject.kt");
+        runTest("compiler/testData/klib/evolution/addCompanionObject.kt");
     }
 
     @Test
     @TestMetadata("addDefaultImplementations.kt")
     public void testAddDefaultImplementations() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addDefaultImplementations.kt");
+        runTest("compiler/testData/klib/evolution/addDefaultImplementations.kt");
     }
 
     @Test
     @TestMetadata("addEnumClassMember.kt")
     public void testAddEnumClassMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addEnumClassMember.kt");
+        runTest("compiler/testData/klib/evolution/addEnumClassMember.kt");
     }
 
     @Test
     @TestMetadata("addLateinitToVar.kt")
     public void testAddLateinitToVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addLateinitToVar.kt");
+        runTest("compiler/testData/klib/evolution/addLateinitToVar.kt");
     }
 
     @Test
     @TestMetadata("addOpenToClass.kt")
     public void testAddOpenToClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToClass.kt");
+        runTest("compiler/testData/klib/evolution/addOpenToClass.kt");
     }
 
     @Test
     @TestMetadata("addOpenToMember.kt")
     public void testAddOpenToMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOpenToMember.kt");
+        runTest("compiler/testData/klib/evolution/addOpenToMember.kt");
     }
 
     @Test
     @TestMetadata("addOrRemoveConst.kt")
     public void testAddOrRemoveConst() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveConst.kt");
+        runTest("compiler/testData/klib/evolution/addOrRemoveConst.kt");
     }
 
     @Test
     @TestMetadata("addOrRemoveInitBlock.kt")
     public void testAddOrRemoveInitBlock() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOrRemoveInitBlock.kt");
+        runTest("compiler/testData/klib/evolution/addOrRemoveInitBlock.kt");
     }
 
     @Test
     @TestMetadata("addOverloads.kt")
     public void testAddOverloads() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addOverloads.kt");
+        runTest("compiler/testData/klib/evolution/addOverloads.kt");
     }
 
     @Test
     @TestMetadata("addParameterDefaulValue.kt")
     public void testAddParameterDefaulValue() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addParameterDefaulValue.kt");
+        runTest("compiler/testData/klib/evolution/addParameterDefaulValue.kt");
     }
 
     @Test
     @TestMetadata("addPropertyAccessor.kt")
     public void testAddPropertyAccessor() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addPropertyAccessor.kt");
+        runTest("compiler/testData/klib/evolution/addPropertyAccessor.kt");
     }
 
     @Test
     @TestMetadata("addingSealedClassMember.kt")
     public void testAddingSealedClassMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/addingSealedClassMember.kt");
+        runTest("compiler/testData/klib/evolution/addingSealedClassMember.kt");
     }
 
     @Test
-    public void testAllFilesPresentInKlibEvolution() throws Exception {
+    public void testAllFilesPresentInEvolution() throws Exception {
-        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/binaryCompatibility/klibEvolution"), Pattern.compile("^(.+)\\.kt$"), null, false);
+        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/klib/evolution"), Pattern.compile("^(.+)\\.kt$"), null, false);
     }
 
     @Test
     @TestMetadata("changeBaseClassOrder.kt")
     public void testChangeBaseClassOrder() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeBaseClassOrder.kt");
+        runTest("compiler/testData/klib/evolution/changeBaseClassOrder.kt");
     }
 
     @Test
     @TestMetadata("changeCompanionToNestedObject.kt")
     public void testChangeCompanionToNestedObject() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeCompanionToNestedObject.kt");
+        runTest("compiler/testData/klib/evolution/changeCompanionToNestedObject.kt");
     }
 
     @Test
     @TestMetadata("changeConstInitialization.kt")
     public void testChangeConstInitialization() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeConstInitialization.kt");
+        runTest("compiler/testData/klib/evolution/changeConstInitialization.kt");
     }
 
     @Test
     @TestMetadata("changeNamesOfTypeParameters.kt")
     public void testChangeNamesOfTypeParameters() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeNamesOfTypeParameters.kt");
+        runTest("compiler/testData/klib/evolution/changeNamesOfTypeParameters.kt");
     }
 
     @Test
     @TestMetadata("changeObjectToCompanion.kt")
     public void testChangeObjectToCompanion() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeObjectToCompanion.kt");
+        runTest("compiler/testData/klib/evolution/changeObjectToCompanion.kt");
     }
 
     @Test
     @TestMetadata("changeParameterDefaultValue.kt")
     public void testChangeParameterDefaultValue() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changeParameterDefaultValue.kt");
+        runTest("compiler/testData/klib/evolution/changeParameterDefaultValue.kt");
     }
 
     @Test
     @TestMetadata("changePropertyFromValToVar.kt")
     public void testChangePropertyFromValToVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyFromValToVar.kt");
+        runTest("compiler/testData/klib/evolution/changePropertyFromValToVar.kt");
     }
 
     @Test
     @TestMetadata("changePropertyInitialization.kt")
     public void testChangePropertyInitialization() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/changePropertyInitialization.kt");
+        runTest("compiler/testData/klib/evolution/changePropertyInitialization.kt");
     }
 
     @Test
     @TestMetadata("constructorParameterMarkValVar.kt")
     public void testConstructorParameterMarkValVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/constructorParameterMarkValVar.kt");
+        runTest("compiler/testData/klib/evolution/constructorParameterMarkValVar.kt");
     }
 
     @Test
     @TestMetadata("deleteOverrideMember.kt")
     public void testDeleteOverrideMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/deleteOverrideMember.kt");
+        runTest("compiler/testData/klib/evolution/deleteOverrideMember.kt");
     }
 
     @Test
     @TestMetadata("deletePrivateMembers.kt")
     public void testDeletePrivateMembers() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/deletePrivateMembers.kt");
+        runTest("compiler/testData/klib/evolution/deletePrivateMembers.kt");
     }
 
     @Test
     @TestMetadata("inlineBodyChange.kt")
     public void testInlineBodyChange() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineBodyChange.kt");
+        runTest("compiler/testData/klib/evolution/inlineBodyChange.kt");
     }
 
     @Test
     @TestMetadata("inlineFunction.kt")
     public void testInlineFunction() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/inlineFunction.kt");
+        runTest("compiler/testData/klib/evolution/inlineFunction.kt");
     }
 
     @Test
     @TestMetadata("makeFunctionInfixOrTailrec.kt")
     public void testMakeFunctionInfixOrTailrec() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/makeFunctionInfixOrTailrec.kt");
+        runTest("compiler/testData/klib/evolution/makeFunctionInfixOrTailrec.kt");
     }
 
     @Test
     @TestMetadata("moreSpecificBaseClass.kt")
     public void testMoreSpecificBaseClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/moreSpecificBaseClass.kt");
+        runTest("compiler/testData/klib/evolution/moreSpecificBaseClass.kt");
     }
 
     @Test
     @TestMetadata("moveMemberUpInHierarchy.kt")
     public void testMoveMemberUpInHierarchy() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/moveMemberUpInHierarchy.kt");
+        runTest("compiler/testData/klib/evolution/moveMemberUpInHierarchy.kt");
     }
 
     @Test
     @TestMetadata("newFakeOverride.kt")
     public void testNewFakeOverride() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/newFakeOverride.kt");
+        runTest("compiler/testData/klib/evolution/newFakeOverride.kt");
     }
 
     @Test
     @TestMetadata("newOverrideMember.kt")
     public void testNewOverrideMember() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/newOverrideMember.kt");
+        runTest("compiler/testData/klib/evolution/newOverrideMember.kt");
     }
 
     @Test
     @TestMetadata("removeAbstractFromClass.kt")
     public void testRemoveAbstractFromClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeAbstractFromClass.kt");
+        runTest("compiler/testData/klib/evolution/removeAbstractFromClass.kt");
     }
 
     @Test
     @TestMetadata("removeInfixOrTailrecFromFunction.kt")
     public void testRemoveInfixOrTailrecFromFunction() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeInfixOrTailrecFromFunction.kt");
+        runTest("compiler/testData/klib/evolution/removeInfixOrTailrecFromFunction.kt");
     }
 
     @Test
     @TestMetadata("removeLateinitFromVar.kt")
     public void testRemoveLateinitFromVar() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removeLateinitFromVar.kt");
+        runTest("compiler/testData/klib/evolution/removeLateinitFromVar.kt");
     }
 
     @Test
     @TestMetadata("removePropertyAccessor.kt")
     public void testRemovePropertyAccessor() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/removePropertyAccessor.kt");
+        runTest("compiler/testData/klib/evolution/removePropertyAccessor.kt");
     }
 
     @Test
     @TestMetadata("renameArguments.kt")
     public void testRenameArguments() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/renameArguments.kt");
+        runTest("compiler/testData/klib/evolution/renameArguments.kt");
     }
 
     @Test
     @TestMetadata("reorderClassConstructors.kt")
     public void testReorderClassConstructors() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/reorderClassConstructors.kt");
+        runTest("compiler/testData/klib/evolution/reorderClassConstructors.kt");
     }
 
     @Test
     @TestMetadata("turnClassIntoDataClass.kt")
     public void testTurnClassIntoDataClass() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/turnClassIntoDataClass.kt");
+        runTest("compiler/testData/klib/evolution/turnClassIntoDataClass.kt");
     }
 
     @Test
     @TestMetadata("widenSuperMemberVisibility.kt")
     public void testWidenSuperMemberVisibility() throws Exception {
-        runTest("compiler/testData/binaryCompatibility/klibEvolution/widenSuperMemberVisibility.kt");
+        runTest("compiler/testData/klib/evolution/widenSuperMemberVisibility.kt");
     }
 }

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

@@ -128,7 +128,7 @@ fun main() {
             testClass<AbstractNativeKlibEvolutionTest>(
                 suiteTestClassName = "NativeKlibEvolutionTestGenerated"
             ) {
-                model("binaryCompatibility/klibEvolution", recursive = false)
+                model("klib/evolution", recursive = false)
             }
             testClass<AbstractNativeKlibEvolutionTest>(
                 suiteTestClassName = "FirNativeKlibEvolutionTestGenerated",
@@ -136,7 +136,7 @@ fun main() {
                     *frontendFir()
                 )
             ) {
-                model("binaryCompatibility/klibEvolution", recursive = false)
+                model("klib/evolution", recursive = false)
             }
         }