From d401d29418ce36b929baa20b819a89e49bc49cb7 Mon Sep 17 00:00:00 2001
From: SvyatoslavScherbina <Svyatoslav.Scherbina@jetbrains.com>
Date: Tue, 22 Dec 2020 12:50:10 +0300
Subject: [PATCH] Run stdlib tests in worker too

---
 .../backend.native/tests/build.gradle         | 21 +++++++++++++++----
 .../text/StringEncodingTestNative.kt          |  2 ++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/kotlin-native/backend.native/tests/build.gradle b/kotlin-native/backend.native/tests/build.gradle
index 87ee21d2406..23f738617ab 100644
--- a/kotlin-native/backend.native/tests/build.gradle
+++ b/kotlin-native/backend.native/tests/build.gradle
@@ -448,6 +448,7 @@ task run_external () {
     // Set up dependencies.
     dependsOn(tasksOf(RunExternalTestGroup))
     dependsOn("stdlibTest")
+    dependsOn("stdlibTestInWorker")
 }
 
 task daily() {
@@ -4922,10 +4923,22 @@ task override_konan_properties0(type: KonanDriverTest) {
     }
 }
 
+createStdlibTest('stdlibTest', /* inWorker = */ false)
+createStdlibTest('stdlibTestInWorker', /*inWorker = */ true)
+
 /**
  * Creates tasks to build and execute stdlib tests.
  */
-KotlinNativeTestKt.createTest(project, 'stdlibTest', KonanGTest) { task ->
+private void createStdlibTest(String name, boolean inWorker) {
+    KotlinNativeTestKt.createTest(project, name, KonanGTest) { task ->
+        configureStdlibTest(task, inWorker)
+    }
+}
+
+/**
+ * Configures tasks to build and execute stdlib tests.
+ */
+private void configureStdlibTest(KonanGTest task, boolean inWorker) {
     def sources = UtilsKt.getFilesToCompile(project,
             [ 'build/stdlib_external/stdlib', 'stdlib_external/utils.kt',
                                  'stdlib_external/collections',
@@ -4934,11 +4947,11 @@ KotlinNativeTestKt.createTest(project, 'stdlibTest', KonanGTest) { task ->
             [ 'build/stdlib_external/stdlib/test/internalAnnotations.kt' ])
 
     konanArtifacts {
-        program('stdlibTest', targets: [target.name]) {
+        program(task.name, targets: [target.name]) {
             srcFiles sources
-            baseDir "$testOutputStdlib/stdlibTest"
+            baseDir "$testOutputStdlib/$task.name"
             enableMultiplatform true
-            extraOpts '-tr',
+            extraOpts inWorker ? '-trw' : '-tr',
                     '-Xverify-ir',
                     '-Xopt-in=kotlin.RequiresOptIn,kotlin.ExperimentalStdlibApi',
                     "-friend-modules", project.rootProject.file("${project.properties['konan.home']}/klib/common/stdlib").absolutePath
diff --git a/kotlin-native/backend.native/tests/stdlib_external/text/StringEncodingTestNative.kt b/kotlin-native/backend.native/tests/stdlib_external/text/StringEncodingTestNative.kt
index e4148285d97..758f56c27d2 100644
--- a/kotlin-native/backend.native/tests/stdlib_external/text/StringEncodingTestNative.kt
+++ b/kotlin-native/backend.native/tests/stdlib_external/text/StringEncodingTestNative.kt
@@ -6,6 +6,8 @@
 package test.text
 
 
+@SharedImmutable
 internal actual val surrogateCodePointDecoding: String = "\uFFFD".repeat(3)
 
+@SharedImmutable
 internal actual val surrogateCharEncoding: ByteArray = byteArrayOf(0xEF.toByte(), 0xBF.toByte(), 0xBD.toByte())