From 762f014c5f2a8e938f987be3534f69e72ee6c378 Mon Sep 17 00:00:00 2001
From: Pavel Punegov <pavel.punegov@jetbrains.com>
Date: Thu, 3 Nov 2022 11:23:36 +0000
Subject: [PATCH] [K/N][test] Don't mark objects with ThreadLocal annotation
 for new MM

Merge-request: KT-MR-7569
Merged-by: Pavel Punegov <Pavel.Punegov@jetbrains.com>
---
 .../support/group/ExtTestCaseGroupProvider.kt          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt
index 2e118778364..cbf06704bdc 100644
--- a/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt
+++ b/native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt
@@ -77,7 +77,7 @@ internal class ExtTestCaseGroupProvider : TestCaseGroupProvider, TestDisposable(
 
                 if (extTestDataFile.isRelevant)
                     testCases += extTestDataFile.createTestCase(
-                        definitelyStandaloneTest = settings.get<ForcedStandaloneTestKind>().value,
+                        settings = settings,
                         sharedModules = sharedModules
                     )
                 else
@@ -149,11 +149,15 @@ private class ExtTestDataFile(
         return TestCompilerArgs(args)
     }
 
-    fun createTestCase(definitelyStandaloneTest: Boolean, sharedModules: ThreadSafeCache<String, TestModule.Shared?>): TestCase {
+    fun createTestCase(settings: Settings, sharedModules: ThreadSafeCache<String, TestModule.Shared?>): TestCase {
         assertTrue(isRelevant)
 
+        if (settings.get<MemoryModel>() == MemoryModel.LEGACY) {
+            makeObjectsMutable()
+        }
+
+        val definitelyStandaloneTest = settings.get<ForcedStandaloneTestKind>().value
         val isStandaloneTest = definitelyStandaloneTest || determineIfStandaloneTest()
-        makeObjectsMutable()
         patchPackageNames(isStandaloneTest)
         patchFileLevelAnnotations()
         val entryPointFunctionFQN = findEntryPoint()