azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N][test] Don't mark objects with ThreadLocal annotation for new MM

Browse Source 
Merge-request: KT-MR-7569
Merged-by: Pavel Punegov <Pavel.Punegov@jetbrains.com>
This commit is contained in:
Pavel Punegov
2022-11-03 11:23:36 +00:00
committed by Space Team
parent 44f638e952
commit 762f014c5f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/support/group/ExtTestCaseGroupProvider.kt
+7 -3
View File
@@ -77,7 +77,7 @@ internal class ExtTestCaseGroupProvider : TestCaseGroupProvider, TestDisposable(
if (extTestDataFile.isRelevant) if (extTestDataFile.isRelevant)
testCases += extTestDataFile.createTestCase( testCases += extTestDataFile.createTestCase(
definitelyStandaloneTest = settings.get<ForcedStandaloneTestKind>().value, settings = settings,
sharedModules = sharedModules sharedModules = sharedModules
) )
else else
@@ -149,11 +149,15 @@ private class ExtTestDataFile(
return TestCompilerArgs(args) 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) assertTrue(isRelevant)
if (settings.get<MemoryModel>() == MemoryModel.LEGACY) {
makeObjectsMutable()
}
val definitelyStandaloneTest = settings.get<ForcedStandaloneTestKind>().value
val isStandaloneTest = definitelyStandaloneTest || determineIfStandaloneTest() val isStandaloneTest = definitelyStandaloneTest || determineIfStandaloneTest()
makeObjectsMutable()
patchPackageNames(isStandaloneTest) patchPackageNames(isStandaloneTest)
patchFileLevelAnnotations() patchFileLevelAnnotations()
val entryPointFunctionFQN = findEntryPoint() val entryPointFunctionFQN = findEntryPoint()