From f834ed45173d624e26b9cddb6a30b8f2de03a4b3 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Tue, 6 Mar 2012 19:00:15 +0400
Subject: [PATCH] Paths fixed

---
 .../org/jetbrains/jet/codegen/ForTestCompileStdlib.java     | 4 ++--
 compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/codegen/ForTestCompileStdlib.java b/compiler/tests/org/jetbrains/jet/codegen/ForTestCompileStdlib.java
index 12c982495df..e53e4bf2651 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/ForTestCompileStdlib.java
+++ b/compiler/tests/org/jetbrains/jet/codegen/ForTestCompileStdlib.java
@@ -99,7 +99,7 @@ public class ForTestCompileStdlib {
 
     private static void compileKotlinPartOfStdlib(File destdir) throws IOException {
         // lame
-        KotlinCompiler.exec(System.err, "-output", destdir.getPath(), "-src", "./stdlib/ktSrc", "-stdlib", destdir.getAbsolutePath());
+        KotlinCompiler.exec(System.err, "-output", destdir.getPath(), "-src", "./libraries/stdlib/src", "-stdlib", destdir.getAbsolutePath());
     }
     
     private static List<File> javaFilesInDir(File dir) {
@@ -122,7 +122,7 @@ public class ForTestCompileStdlib {
 
         StandardJavaFileManager fileManager = javaCompiler.getStandardFileManager(null, Locale.ENGLISH, Charset.forName("utf-8"));
         try {
-            Iterable<? extends JavaFileObject> javaFileObjectsFromFiles = fileManager.getJavaFileObjectsFromFiles(javaFilesInDir(new File("stdlib/src")));
+            Iterable<? extends JavaFileObject> javaFileObjectsFromFiles = fileManager.getJavaFileObjectsFromFiles(javaFilesInDir(new File("runtime/src")));
             List<String> options = Arrays.asList(
                     "-d", destdir.getPath()
             );
diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
index 2f999a3d9e1..29e1429ee3b 100644
--- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+++ b/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("testlib/lib/junit-4.9.jar");
+            File junitJar = new File("libraries/testlib/lib/junit-4.9.jar");
 
             if (!junitJar.exists()) {
                 throw new AssertionError();
@@ -82,8 +82,8 @@ public class TestlibTest extends CodegenTestCase {
             myEnvironment.addToClasspath(junitJar);
 
             CoreLocalFileSystem localFileSystem = myEnvironment.getLocalFileSystem();
-            session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../testlib/test"));
-            session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../kunit/src"));
+            session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/testlib/test"));
+            session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/kunit/src"));
 
             if (!session.analyze(System.err, MessageRenderer.PLAIN)) {
                 throw new RuntimeException("There were compilation errors");