[K/N] Implement a concept of conditional ignore of K/N blackbox tests

^KT-59288 Fixed

compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateSuperType.kt

@@ -1,6 +1,7 @@
 // Fails on native when run with `-Pkotlin.internal.native.test.cacheMode=STATIC_EVERYWHERE`.
 // Looks like the call to `k` fails as `k` is not exported from the lib module.
-// IGNORE_BACKEND: NATIVE
+// IGNORE_NATIVE: cacheMode=STATIC_EVERYWHERE
+// IGNORE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE
 // MODULE: lib
 // FILE: Z.kt
 package z

compiler/testData/codegen/box/ir/kt55318.kt

@@ -1,7 +1,5 @@
 // IGNORE_BACKEND_K1: JS_IR, JS_IR_ES6, NATIVE, WASM
 // ISSUE: KT-55318
-// KT-55486: native linker error with `-Pkotlin.internal.native.test.cacheMode=STATIC_EVERYWHERE`
-// IGNORE_BACKEND_K2: NATIVE
 
 // MODULE: lib
 // FILE: lib.kt

compiler/testData/codegen/box/multiplatform/defaultArguments/typeAlias2.kt

@@ -1,6 +1,7 @@
 // !LANGUAGE: +MultiPlatformProjects
 // WITH_STDLIB
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // MODULE: common
 // FILE: common.kt
 expect class A {

compiler/testData/codegen/box/multiplatform/k2/annotations/expectAnnotationCallInLibrary.kt

@@ -1,5 +1,5 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
 // ISSUE: KT-57963
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/anonymousObjectAndSpecificImplementationInDeserializedIr.kt

@@ -1,7 +1,8 @@
 // LANGUAGE: +MultiPlatformProjects
 // WITH_STDLIB
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
 //   JS tests don't support MPP modules compilation
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // ISSUE: KT-58252
 
 // MODULE: lib-common

compiler/testData/codegen/box/multiplatform/k2/basic/accessToLocalClassFromBackend.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: lib

compiler/testData/codegen/box/multiplatform/k2/basic/enumEntryNameCall.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualCallableReference.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentExtensionReceiversOnOverloads.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualDifferentPackages.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-58003
 

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-58004
 

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-58124
 

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualMultiCommon.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common0

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualNullabilityBasedOverloads.kt

@@ -1,5 +1,6 @@
 // IGNORE_BACKEND: JVM, JVM_IR
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualOverloads.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // Ignore until KT-62926 is fixed

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualSimple.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypeParameters.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealias.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/expectActualTypealiasCoercion.kt

@@ -1,7 +1,7 @@
 // TARGET_BACKEND: JVM_IR
 // TARGET_BACKEND: NATIVE
 
-// IGNORE_BACKEND_K1: NATIVE
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects +ImplicitSignedToUnsignedIntegerConversion
 // WITH_STDLIB
 

compiler/testData/codegen/box/multiplatform/k2/basic/expectAndCommonFunctionOverloads.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-58896
 

compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 // !LANGUAGE: +MultiPlatformProjects
 // IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-62535

compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 // IGNORE_CODEGEN_WITH_IR_FAKE_OVERRIDE_GENERATION: KT-62535
 // !LANGUAGE: +MultiPlatformProjects

compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/basic/fakeOverridesInPlatformModule.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common1

compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // ISSUE: KT-58229
 // WITH_STDLIB
 

compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // ISSUE: KT-60850
 // WITH_STDLIB
 

compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-56329
 

compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // ISSUE: KT-58229
 // WITH_STDLIB
 

compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // ISSUE: KT-60850
 // WITH_STDLIB
 

compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // ISSUE: KT-58229
 // WITH_STDLIB
 

compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // MODULE: common
 // FILE: common.kt
 

compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // ISSUE: KT-58229
 // WITH_STDLIB
 

compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/dataClassInCommonAndPlatform.kt

@@ -1,6 +1,7 @@
 // LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-61972
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM, NATIVE
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // MODULE: common
 // FILE: common.kt
 data class CommonData(val value: String)

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/constructor.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/defaultArgumentInDelegatedFunction.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-62671
 

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/delegatedExpectedInterface.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/dispatchReceiverValue.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // ISSUE: KT-57181
 // WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS
 // !LANGUAGE: +MultiPlatformProjects

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/expectPropertyAsDefaultArgument.kt

@@ -1,4 +1,5 @@
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // !LANGUAGE: +MultiPlatformProjects
 // ISSUE: KT-57263
 

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/extensionReceiverValue.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/function.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromCommonClass.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedClass.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedInterface.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedFromExpectedMethod.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedInExpectedDeclarations.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inheritedViaAnotherInterfaceIndirectly.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/inlineFunctionWithDefaultLambda.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23239.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/kt23739.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/parametersInArgumentValues.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/suspend.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 // WITH_COROUTINES
 

compiler/testData/codegen/box/multiplatform/k2/defaultArguments/typeAlias.kt

@@ -1,5 +1,6 @@
 // !LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, NATIVE, WASM
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // WITH_STDLIB
 
 // MODULE: common

compiler/testData/codegen/box/multiplatform/k2/internalOverride.kt

@@ -1,6 +1,7 @@
 // LANGUAGE: +MultiPlatformProjects
 // It accidentially passes K1 JVM while not intended to do so.
-// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM, NATIVE
+// IGNORE_BACKEND_K1: JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // MODULE: common
 // FILE: common.kt
 

compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt

@@ -4,7 +4,8 @@
 // TARGET_BACKEND: WASM
 // TARGET_BACKEND: JVM_IR
 
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt

@@ -4,7 +4,8 @@
 // TARGET_BACKEND: WASM
 // TARGET_BACKEND: JVM_IR
 
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt

@@ -4,7 +4,8 @@
 // TARGET_BACKEND: WASM
 // TARGET_BACKEND: JVM_IR
 
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // IllegalArgumentException: arg wrongly != this@Test5: arg=null, this@Test5=[object Object]
 // IGNORE_BACKEND_K2: JS_IR, JS_IR_ES6

compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt

@@ -5,7 +5,8 @@
 // TARGET_BACKEND: WASM
 // TARGET_BACKEND: JVM_IR
 
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 
 // MODULE: common
 // FILE: common.kt

compiler/testData/codegen/box/multiplatform/kt59613.kt

@@ -1,5 +1,6 @@
 // LANGUAGE: +MultiPlatformProjects
-// IGNORE_BACKEND_K1: ANY
+// IGNORE_BACKEND_K1: JVM, JVM_IR, JS, JS_IR, JS_IR_ES6, WASM
+// IGNORE_NATIVE_K1: mode=ONE_STAGE_MULTI_MODULE
 // IGNORE_REASON: multimodule MPP tests are not supported in K1
 // ISSUE: KT-59613
 

compiler/testData/codegen/box/nullCheckOptimization/kt49136a.kt

@@ -1,5 +1,6 @@
 // https://youtrack.jetbrains.com/issue/KT-50289/EXCBADACCESS-getting-non-null-property-in-safe-call-chain
-// IGNORE_BACKEND: NATIVE
+// IGNORE_NATIVE: optimizationMode=DEBUG
+// IGNORE_NATIVE: optimizationMode=NO
 
 abstract class Z {
     init {

compiler/testData/codegen/box/sameFileInSourceAndDependencies/propertyDeclaration.kt

@@ -1,4 +1,7 @@
-// IGNORE_BACKEND: NATIVE
+// IGNORE_NATIVE: cacheMode=NO
+// IGNORE_NATIVE: cacheMode=STATIC_ONLY_DIST
+// IGNORE_NATIVE: cacheMode=STATIC_EVERYWHERE && target=linux_x64
+// IGNORE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE && target=linux_x64
 // IGNORE_BACKEND: JS_IR, JS_IR_ES6
 // IGNORE_BACKEND: WASM
 // MODULE: lib

compiler/testData/codegen/box/syntheticAccessors/kt49316.kt

@@ -1,6 +1,6 @@
 // The test isn't passing when using K/N per-file caches and in order to fix it,
 // some hacks are required, which isn't worth it considering that test contains invalid code (reassign of val property).
-// IGNORE_BACKEND: NATIVE
+// DISABLE_NATIVE
 // IGNORE_BACKEND_K2: ANY
 // FIR_STATUS: KT-35565
 //  java.lang.AssertionError

compiler/testData/codegen/box/volatile/crossModuleIntrinsic.kt

@@ -1,6 +1,7 @@
 // TARGET_BACKEND: NATIVE
 // test is disabled now because of https://youtrack.jetbrains.com/issue/KT-55426
-// IGNORE_BACKEND: NATIVE
+// IGNORE_NATIVE: cacheMode=STATIC_EVERYWHERE
+// IGNORE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE
 
 // MODULE: lib
 // FILE: lib.kt
@@ -14,7 +15,7 @@ class Box(@Volatile var value: String)
 // MODULE: main(lib)
 // FILE: main.kt
 
-@file:Suppress("INVISIBLE_MEMBER")
+@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
 import kotlin.native.concurrent.*
 import kotlin.concurrent.*

compiler/testData/codegen/boxInline/complex/kt44429.kt

@@ -1,6 +1,7 @@
 // IGNORE_BACKEND: WASM
 // https://youtrack.jetbrains.com/issue/KT-44571/Segfault-on-unnecessary-int-unboxing
-// IGNORE_BACKEND: NATIVE
+// IGNORE_NATIVE: optimizationMode=DEBUG
+// IGNORE_NATIVE: optimizationMode=NO
 // NO_CHECK_LAMBDA_INLINING
 // FILE: 1.kt
 package test

compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java

@@ -81,7 +81,7 @@ public class KotlinTestUtils {
     private static final boolean AUTOMATICALLY_UNMUTE_PASSED_TESTS = false;
     private static final boolean AUTOMATICALLY_MUTE_FAILED_TESTS = false;
 
-    private static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*[!]?([A-Z_]+)(:[ \\t]*(.*))?$", Pattern.MULTILINE);
+    private static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*[!]?([A-Z_0-9]+)(:[ \\t]*(.*))?$", Pattern.MULTILINE);
 
     private KotlinTestUtils() {
     }

compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java

@@ -28886,6 +28886,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/multiplatform/callToJavaSuper.kt");
         }
 
+        @TestMetadata("kt59613.kt")
+        public void ignoreKt59613() throws Exception {
+            runTest("compiler/testData/codegen/box/multiplatform/kt59613.kt");
+        }
+
         private void runTest(String testDataFilePath) throws Exception {
             KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
         }
@@ -28919,11 +28924,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             runTest("compiler/testData/codegen/box/multiplatform/expectProperty.kt");
         }
 
-        @TestMetadata("kt59613.kt")
-        public void testKt59613() throws Exception {
-            runTest("compiler/testData/codegen/box/multiplatform/kt59613.kt");
-        }
-
         @TestMetadata("kt60854.kt")
         public void testKt60854() throws Exception {
             runTest("compiler/testData/codegen/box/multiplatform/kt60854.kt");
@@ -28986,6 +28986,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/superCall.kt");
             }
 
+            @TestMetadata("typeAlias2.kt")
+            public void ignoreTypeAlias2() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/typeAlias2.kt");
+            }
+
             private void runTest(String testDataFilePath) throws Exception {
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
             }
@@ -29109,11 +29114,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/typeAlias.kt");
             }
 
-            @TestMetadata("typeAlias2.kt")
-            public void testTypeAlias2() throws Exception {
-                runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/typeAlias2.kt");
-            }
-
             @TestMetadata("withTypeParameter.kt")
             public void testWithTypeParameter() throws Exception {
                 runTest("compiler/testData/codegen/box/multiplatform/defaultArguments/withTypeParameter.kt");
@@ -29170,13 +29170,13 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
         @TestDataPath("$PROJECT_ROOT")
         @RunWith(JUnit3RunnerWithInners.class)
         public static class K2 extends AbstractLightAnalysisModeTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
+            @TestMetadata("actualInnerClassesFirMemberMapping.kt")
+            public void ignoreActualInnerClassesFirMemberMapping() throws Exception {
+                runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt");
             }
 
-            @TestMetadata("actualInnerClassesFirMemberMapping.kt")
-            public void testActualInnerClassesFirMemberMapping() throws Exception {
-                runTest("compiler/testData/codegen/box/multiplatform/k2/actualInnerClassesFirMemberMapping.kt");
+            private void runTest(String testDataFilePath) throws Exception {
+                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
             }
 
             public void testAllFilesPresentInK2() throws Exception {
@@ -29260,6 +29260,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class Basic extends AbstractLightAnalysisModeTest {
+                @TestMetadata("anyMethodInExpect.kt")
+                public void ignoreAnyMethodInExpect() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt");
+                }
+
                 @TestMetadata("expectActualFakeOverrides2.kt")
                 public void ignoreExpectActualFakeOverrides2() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt");
@@ -29300,11 +29305,41 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectProperty.kt");
                 }
 
+                @TestMetadata("intersectionOverrideInCommonModule.kt")
+                public void ignoreIntersectionOverrideInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
+                }
+
+                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void ignoreIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
+                @TestMetadata("localIntersectionOverrideInCommonModule.kt")
+                public void ignoreLocalIntersectionOverrideInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
+                }
+
+                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
+                public void ignoreLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
+                }
+
+                @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
+                public void ignoreLocalSubstitutionOverrideInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt");
+                }
+
                 @TestMetadata("noArgActualConstructor.kt")
                 public void ignoreNoArgActualConstructor() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/noArgActualConstructor.kt");
                 }
 
+                @TestMetadata("nonExternalEquals.kt")
+                public void ignoreNonExternalEquals() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt");
+                }
+
                 @TestMetadata("overridesOfExpectMembers.kt")
                 public void ignoreOverridesOfExpectMembers() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt");
@@ -29315,6 +29350,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/removeExpectDeclarationsFromMetadata.kt");
                 }
 
+                @TestMetadata("substitutionOverrideInCommonModule.kt")
+                public void ignoreSubstitutionOverrideInCommonModule() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt");
+                }
+
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
                 }
@@ -29333,11 +29373,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/basic"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
                 }
 
-                @TestMetadata("anyMethodInExpect.kt")
-                public void testAnyMethodInExpect() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/anyMethodInExpect.kt");
-                }
-
                 @TestMetadata("correctParentForTypeParameter.kt")
                 public void testCorrectParentForTypeParameter() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/correctParentForTypeParameter.kt");
@@ -29433,16 +29468,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt");
                 }
 
-                @TestMetadata("intersectionOverrideInCommonModule.kt")
-                public void testIntersectionOverrideInCommonModule() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideInCommonModule.kt");
-                }
-
-                @TestMetadata("intersectionOverrideWithDefaultParameterInCommonModule.kt")
-                public void testIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/intersectionOverrideWithDefaultParameterInCommonModule.kt");
-                }
-
                 @TestMetadata("kt-51753-1.kt")
                 public void testKt_51753_1() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-51753-1.kt");
@@ -29458,31 +29483,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/kt-56329.kt");
                 }
 
-                @TestMetadata("localIntersectionOverrideInCommonModule.kt")
-                public void testLocalIntersectionOverrideInCommonModule() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideInCommonModule.kt");
-                }
-
-                @TestMetadata("localIntersectionOverrideWithDefaultParameterInCommonModule.kt")
-                public void testLocalIntersectionOverrideWithDefaultParameterInCommonModule() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localIntersectionOverrideWithDefaultParameterInCommonModule.kt");
-                }
-
-                @TestMetadata("localSubstitutionOverrideInCommonModule.kt")
-                public void testLocalSubstitutionOverrideInCommonModule() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/localSubstitutionOverrideInCommonModule.kt");
-                }
-
-                @TestMetadata("nonExternalEquals.kt")
-                public void testNonExternalEquals() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt");
-                }
-
-                @TestMetadata("substitutionOverrideInCommonModule.kt")
-                public void testSubstitutionOverrideInCommonModule() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/basic/substitutionOverrideInCommonModule.kt");
-                }
-
                 @TestMetadata("transitiveSuperclassActualization.kt")
                 public void testTransitiveSuperclassActualization() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/basic/transitiveSuperclassActualization.kt");
@@ -29508,6 +29508,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class ComplexMatchings extends AbstractLightAnalysisModeTest {
+                @TestMetadata("expectCtorlessFinalToActualObject.kt")
+                public void ignoreExpectCtorlessFinalToActualObject() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt");
+                }
+
+                @TestMetadata("expectCtorlessFinalToActualUnit.kt")
+                public void ignoreExpectCtorlessFinalToActualUnit() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt");
+                }
+
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
                 }
@@ -29515,16 +29525,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 public void testAllFilesPresentInComplexMatchings() throws Exception {
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/complexMatchings"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
                 }
-
-                @TestMetadata("expectCtorlessFinalToActualObject.kt")
-                public void testExpectCtorlessFinalToActualObject() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualObject.kt");
-                }
-
-                @TestMetadata("expectCtorlessFinalToActualUnit.kt")
-                public void testExpectCtorlessFinalToActualUnit() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/complexMatchings/expectCtorlessFinalToActualUnit.kt");
-                }
             }
 
             @TestMetadata("compiler/testData/codegen/box/multiplatform/k2/defaultArguments")
@@ -29679,6 +29679,26 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
             public static class MigratedOldTests extends AbstractLightAnalysisModeTest {
+                @TestMetadata("mpp1.kt")
+                public void ignoreMpp1() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt");
+                }
+
+                @TestMetadata("mpp2.kt")
+                public void ignoreMpp2() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt");
+                }
+
+                @TestMetadata("mpp_default_args.kt")
+                public void ignoreMpp_default_args() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt");
+                }
+
+                @TestMetadata("remap_expect_property_ref.kt")
+                public void ignoreRemap_expect_property_ref() throws Exception {
+                    runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt");
+                }
+
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
                 }
@@ -29687,30 +29707,10 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
                 }
 
-                @TestMetadata("mpp1.kt")
-                public void testMpp1() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp1.kt");
-                }
-
-                @TestMetadata("mpp2.kt")
-                public void testMpp2() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp2.kt");
-                }
-
-                @TestMetadata("mpp_default_args.kt")
-                public void testMpp_default_args() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_default_args.kt");
-                }
-
                 @TestMetadata("mpp_optional_expectation.kt")
                 public void testMpp_optional_expectation() throws Exception {
                     runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/mpp_optional_expectation.kt");
                 }
-
-                @TestMetadata("remap_expect_property_ref.kt")
-                public void testRemap_expect_property_ref() throws Exception {
-                    runTest("compiler/testData/codegen/box/multiplatform/k2/migratedOldTests/remap_expect_property_ref.kt");
-                }
             }
         }