Build stdlib-jdk7/8 tests as multiplatform manually

2018-01-26 20:56:52 +03:00
parent 9b38e5e7b5
commit 38be99daa3
4 changed files with 20 additions and 8 deletions
@@ -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')