From 38be99daa36299f51324c4659e1eba806371bcd3 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Fri, 26 Jan 2018 20:56:52 +0300
Subject: [PATCH] Build stdlib-jdk7/8 tests as multiplatform manually

---
 libraries/stdlib/jdk7/build.gradle | 7 +++++--
 libraries/stdlib/jdk8/build.gradle | 7 +++++--
 libraries/stdlib/jre7/build.gradle | 7 +++++--
 libraries/stdlib/jre8/build.gradle | 7 +++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/libraries/stdlib/jdk7/build.gradle b/libraries/stdlib/jdk7/build.gradle
index 70cb93eaaa1..bd2d842a4d7 100644
--- a/libraries/stdlib/jdk7/build.gradle
+++ b/libraries/stdlib/jdk7/build.gradle
@@ -22,7 +22,9 @@ sourceSets {
         kotlin {
             srcDir 'test'
             if(!System.properties.'idea.active') {
-                srcDir '../test'
+                srcDir '../jvm/test'
+                srcDir '../common/test'
+                srcDir '../common/build/common-test-sources'
             }
         }
     }
@@ -64,7 +66,8 @@ compileKotlin {
 }
 
 compileTestKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    dependsOn(":kotlin-stdlib-common:preprocessSourcesTest")
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"]
 }
 
 compileJava9Sources(project, 'kotlin.stdlib.jdk7')
diff --git a/libraries/stdlib/jdk8/build.gradle b/libraries/stdlib/jdk8/build.gradle
index a202598b0ca..f0aec2e59d1 100644
--- a/libraries/stdlib/jdk8/build.gradle
+++ b/libraries/stdlib/jdk8/build.gradle
@@ -24,7 +24,9 @@ sourceSets {
         kotlin {
             srcDir 'test'
             if(!System.properties.'idea.active') {
-                srcDir '../test'
+                srcDir '../jvm/test'
+                srcDir '../common/test'
+                srcDir '../common/build/common-test-sources'
                 srcDir '../jdk7/test'
             }
         }
@@ -67,7 +69,8 @@ compileKotlin {
 }
 
 compileTestKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    dependsOn(":kotlin-stdlib-common:preprocessSourcesTest")
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"]
 }
 
 compileJava9Sources(project, 'kotlin.stdlib.jdk8')
diff --git a/libraries/stdlib/jre7/build.gradle b/libraries/stdlib/jre7/build.gradle
index 1cd2dfa124d..2718547ccda 100644
--- a/libraries/stdlib/jre7/build.gradle
+++ b/libraries/stdlib/jre7/build.gradle
@@ -22,7 +22,9 @@ sourceSets {
         kotlin {
             srcDir 'test'
             if(!System.properties.'idea.active') {
-                srcDir '../test'
+                srcDir '../jvm/test'
+                srcDir '../common/test'
+                srcDir '../common/build/common-test-sources'
             }
         }
     }
@@ -57,7 +59,8 @@ compileKotlin {
 }
 
 compileTestKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
+    dependsOn(":kotlin-stdlib-common:preprocessSourcesTest")
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"]
 }
 
 kotlin.experimental.coroutines 'enable'
diff --git a/libraries/stdlib/jre8/build.gradle b/libraries/stdlib/jre8/build.gradle
index fe3122edc1a..1da6b60712f 100644
--- a/libraries/stdlib/jre8/build.gradle
+++ b/libraries/stdlib/jre8/build.gradle
@@ -24,7 +24,9 @@ sourceSets {
         kotlin {
             srcDir 'test'
             if(!System.properties.'idea.active') {
-                srcDir '../test'
+                srcDir '../jvm/test'
+                srcDir '../common/test'
+                srcDir '../common/build/common-test-sources'
                 srcDir '../jre7/test'
             }
         }
@@ -60,7 +62,8 @@ compileKotlin {
 }
 
 compileTestKotlin {
-    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable"]
+    dependsOn(":kotlin-stdlib-common:preprocessSourcesTest")
+    kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", "-Xmulti-platform"]
 }
 
 kotlin.experimental.coroutines 'enable'