Merge remote branch 'upstream/master'

libraries/kdoc/ApiDocsModule.kt

@@ -2,7 +2,7 @@ import kotlin.modules.*
 
 fun project() {
     module("apidocs") {
-        classpath += "../kunit/lib/junit-4.9.jar"
+        classpath += "../lib/junit-4.9.jar"
 
         addSourceFiles("../stdlib/src")
         addSourceFiles("../kunit/src/main/kotlin")

libraries/kunit/module.kt

@@ -3,7 +3,7 @@ import kotlin.modules.*
 fun project() {
     module("kunit") {
         // TODO how to refer to the dir of the module?
-        classpath += "kunit/lib/junit-4.9.jar"
+        classpath += "lib/junit-4.9.jar"
 
         addSourceFiles("src/main/kotlin")
     }

libraries/stdlib/testModule.kt

@@ -0,0 +1,9 @@
+import kotlin.modules.*
+
+fun project() {
+    module("testlib") {
+        classpath += "lib/junit-4.9.jar"
+
+        addSourceFiles("test")
+    }
+}

libraries/testlib/module.kt

@@ -1,11 +0,0 @@
-import kotlin.modules.*
-
-fun project() {
-    module("testlib") {
-        // TODO how to refer to the dir of the module?
-        classpath += "dist/kotlinc/lib/kotlin-test.jar"
-        classpath += "kunit/lib/junit-4.9.jar"
-
-        addSourceFiles("test")
-    }
-}