[Tests] Split test runners for CrossCompilationIdentityTest

^KT-72593 Fixed

Author: vsukharev

native/native.tests/klib-ir-inliner/tests-gen/org/jetbrains/kotlin/konan/test/klib/FirKlibCrossCompilationIdentityWithPreSerializationLoweringTestGenerated.java

@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.konan.test.inlining.AbstractNativeUnboundIrSerializa
 import org.jetbrains.kotlin.konan.test.irText.*
 import org.jetbrains.kotlin.konan.test.dump.*
 import org.jetbrains.kotlin.konan.test.klib.AbstractFirKlibCrossCompilationIdentityTest
+import org.jetbrains.kotlin.konan.test.klib.AbstractFirKlibCrossCompilationIdentityWithPreSerializationLoweringTest
 import org.jetbrains.kotlin.konan.test.serialization.AbstractNativeIrDeserializationTest
 import org.jetbrains.kotlin.konan.test.serialization.AbstractNativeIrDeserializationWithInlinedFunInKlibTest
 import org.jetbrains.kotlin.konan.test.syntheticAccessors.*
@@ -294,6 +295,9 @@ fun main() {
             testClass<AbstractFirKlibCrossCompilationIdentityTest> {
                 model()
             }
+            testClass<AbstractFirKlibCrossCompilationIdentityWithPreSerializationLoweringTest> {
+                model()
+            }
         }
     }
 

native/native.tests/klib-ir-inliner/tests/org/jetbrains/kotlin/generators/tests/GenerateKlibNativeTests.kt

@@ -44,6 +44,7 @@ import org.jetbrains.kotlin.test.services.configuration.CommonEnvironmentConfigu
 import org.jetbrains.kotlin.test.services.configuration.NativeEnvironmentConfigurator
 import org.jetbrains.kotlin.test.services.moduleStructure
 import org.jetbrains.kotlin.test.utils.MultiModuleInfoDumper
+import org.jetbrains.kotlin.utils.bind
 import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.Tag
 import java.io.File
@@ -58,7 +59,24 @@ import java.io.File
  * indirectly asserts that the generated klib is "identical" across these hosts
  */
 @Tag("klib")
-open class AbstractFirKlibCrossCompilationIdentityTest : AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.NATIVE) {
+open class AbstractFirKlibCrossCompilationIdentityTest : AbstractFirKlibCrossCompilationIdentityTestBase("")
+@Tag("klib")
+open class AbstractFirKlibCrossCompilationIdentityWithPreSerializationLoweringTest :
+    AbstractFirKlibCrossCompilationIdentityTestBase(".lowered") {
+
+    override fun configure(builder: TestConfigurationBuilder) {
+        super.configure(builder)
+        with(builder) {
+            defaultDirectives {
+                LANGUAGE with "+${LanguageFeature.IrInlinerBeforeKlibSerialization.name}"
+            }
+        }
+    }
+}
+
+open class AbstractFirKlibCrossCompilationIdentityTestBase(val irFileSuffix: String = "") :
+    AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.NATIVE) {
+
     override fun configure(builder: TestConfigurationBuilder) = with(builder) {
         globalDefaults {
             frontend = FrontendKinds.FIR
@@ -82,7 +100,7 @@ open class AbstractFirKlibCrossCompilationIdentityTest : AbstractKotlinCompilerW
 
             DiagnosticsDirectives.DIAGNOSTICS with "-warnings"
 
-            LANGUAGE with "+${LanguageFeature.IrInlinerBeforeKlibSerialization.name}"
+            LANGUAGE with "-${LanguageFeature.IrInlinerBeforeKlibSerialization.name}"
         }
 
         useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor)
@@ -114,7 +132,7 @@ open class AbstractFirKlibCrossCompilationIdentityTest : AbstractKotlinCompilerW
         }
         facadeStep(::FirNativeKlibSerializerFacade)
         klibArtifactsHandlersStep {
-            useHandlers(::NativeKlibCrossCompilationIdentityHandler)
+            useHandlers(::NativeKlibCrossCompilationIdentityHandler.bind(irFileSuffix))
         }
     }
 
@@ -132,7 +150,7 @@ open class AbstractFirKlibCrossCompilationIdentityTest : AbstractKotlinCompilerW
     }
 }
 
-private class NativeKlibCrossCompilationIdentityHandler(testServices: TestServices) : KlibArtifactHandler(testServices) {
+private class NativeKlibCrossCompilationIdentityHandler(testServices: TestServices, val irFileSuffix: String) : KlibArtifactHandler(testServices) {
     private val metadataDumper = newDumper()
     private val irDumper = newDumper()
     private val manifestDumper = newDumper()
@@ -167,7 +185,7 @@ private class NativeKlibCrossCompilationIdentityHandler(testServices: TestServic
         assertions.assertAll(
             listOf(
                 metadataDumper.checkGoldenData(goldenDataFileExtension = "metadata.txt"),
-                irDumper.checkGoldenData(goldenDataFileExtension = "ir.txt"),
+                irDumper.checkGoldenData(goldenDataFileExtension = "ir$irFileSuffix.txt"),
                 manifestDumper.checkGoldenData(goldenDataFileExtension = "manifest")
             )
         )

native/native.tests/klib-ir-inliner/tests/org/jetbrains/kotlin/konan/test/klib/AbstractFirKlibCrossCompilationIdentityTest.kt

@@ -0,0 +1,23 @@
+// MODULE: lib
+MODULE_FRAGMENT name:<lib>
+  FILE fqName:lib fileName:/lib.kt
+    FUN name:createNSString signature:lib/createNSString|createNSString(){}[0] visibility:public modality:FINAL returnType:platform.Foundation.NSString
+      BLOCK_BODY
+        VAR name:x type:platform.Foundation.NSString [val]
+          CONSTRUCTOR_CALL 'platform.Foundation/NSString.<init>|objc:init#Constructor[100]' type=platform.Foundation.NSString origin=null
+        RETURN type=kotlin.Nothing from='lib/createNSString|createNSString(){}[0]'
+          GET_VAR 'val x: platform.Foundation.NSString [val] declared in lib.createNSString' type=platform.Foundation.NSString origin=null
+
+// MODULE: app
+MODULE_FRAGMENT name:<app>
+  FILE fqName:app fileName:/app.kt
+    FUN name:main signature:app/main|main(){}[0] visibility:public modality:FINAL returnType:kotlin.Unit
+      BLOCK_BODY
+        VAR name:x type:platform.Foundation.NSString [val]
+          CALL 'lib/createNSString|createNSString(){}[0]' type=platform.Foundation.NSString origin=null
+        CALL 'kotlin/check|check(kotlin.Boolean){}[0]' type=kotlin.Unit origin=null
+          ARG 1: CALL 'kotlin.internal.ir/EQEQ|EQEQ(kotlin.Any?;kotlin.Any?){}[0]' type=kotlin.Boolean origin=EQEQ
+            ARG arg0: CALL 'kotlin/ULong.toInt|toInt(){}[0]' type=kotlin.Int origin=null
+              ARG 1: CALL 'platform.Foundation/NSString.length.<get-length>|objc:length#Accessor[100]' type=kotlin.ULong origin=GET_PROPERTY
+                ARG 1: GET_VAR 'val x: platform.Foundation.NSString [val] declared in app.main' type=platform.Foundation.NSString origin=null
+            ARG arg1: CONST Int type=kotlin.Int value=0