Merge remote branch 'upstream/master'

build-tools/build.xml

@@ -2,7 +2,7 @@
 
     <property name="tests-dir"   location="${output}/ant-test/build-tools-test"/>
     <property name="tests-jar"   location="${tests-dir}/out.jar"/>
-    <property name="junit-jar"   location="${basedir}/libraries/testlib/lib/junit-4.9.jar"/>
+    <property name="junit-jar"   location="${basedir}/libraries/lib/junit-4.9.jar"/>
     <property name="failonerror" value="true"/>  <!-- Whether invoking compiled classes should file on error -->
     <property name="use-ivy"     value="false"/> <!-- Whether Ivy should be used to define "kotlin.classpath" and <kotlinc> task -->
                                                  <!-- Override with "-Duse-ivy=true" -->
@@ -378,19 +378,19 @@
     <macrodef name="testlib-tests">
         <sequential>
             <!-- Dir => Dir -->
-            <kotlinc-dir         src       = "${basedir}/libraries/testlib/test"/>
+            <kotlinc-dir         src       = "${basedir}/libraries/stdlib/test"/>
             <testlib-junit-tests classpath = "${tests-dir}"/>
 
             <!-- Dir => Jar -->
-            <kotlinc-jar         src       = "${basedir}/libraries/testlib/test"/>
+            <kotlinc-jar         src       = "${basedir}/libraries/stdlib/test"/>
             <testlib-junit-tests classpath = "${tests-jar}"/>
 
             <!-- Module => Explicit Jar -->
-            <kotlinc-jar         module    = "${basedir}/libraries/testlib/module.kt"/>
+            <kotlinc-jar         module    = "${basedir}/libraries/stdlib/testModule.kt"/>
             <testlib-junit-tests classpath = "${tests-jar}"/>
 
             <!-- Module => Default Jar -->
-            <kotlinc-jar         module    = "${basedir}/libraries/testlib/module.kt" jar=""/>
+            <kotlinc-jar         module    = "${basedir}/libraries/stdlib/testModule.kt" jar=""/>
             <move file="${basedir}/libraries/testlib/testlib.jar" todir="${tests-dir}"/>
             <testlib-junit-tests classpath = "${tests-dir}/testlib.jar"/>
         </sequential>

compiler/tests/org/jetbrains/jet/codegen/StdlibTest.java

@@ -38,7 +38,7 @@ public class StdlibTest extends CodegenTestCase {
         super.setUp();
         createEnvironmentWithFullJdk();
         myEnvironment.addToClasspath(ForTestCompileStdlib.stdlibJarForTests());
-        File junitJar = new File("libraries/testlib/lib/junit-4.9.jar");
+        File junitJar = new File("libraries/lib/junit-4.9.jar");
 
         if (!junitJar.exists()) {
             throw new AssertionError();

compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java

@@ -73,7 +73,7 @@ public class TestlibTest extends CodegenTestCase {
 
             myEnvironment.addToClasspath(ForTestCompileStdlib.stdlibJarForTests());
 
-            File junitJar = new File("libraries/testlib/lib/junit-4.9.jar");
+            File junitJar = new File("libraries/lib/junit-4.9.jar");
 
             if (!junitJar.exists()) {
                 throw new AssertionError();

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")
-    }
-}