azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Paths fixed

Browse Source
This commit is contained in:
Andrey Breslav
2012-03-06 19:00:15 +04:00
parent 0a08ac5fe8
commit f834ed4517
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/ForTestCompileStdlib.java
+2 -2
View File
@@ -99,7 +99,7 @@ public class ForTestCompileStdlib {
private static void compileKotlinPartOfStdlib(File destdir) throws IOException { private static void compileKotlinPartOfStdlib(File destdir) throws IOException {
// lame // 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) { 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")); StandardJavaFileManager fileManager = javaCompiler.getStandardFileManager(null, Locale.ENGLISH, Charset.forName("utf-8"));
try { 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( List<String> options = Arrays.asList(
"-d", destdir.getPath() "-d", destdir.getPath()
); );
compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java
+3 -3
View File
@@ -73,7 +73,7 @@ public class TestlibTest extends CodegenTestCase {
myEnvironment.addToClasspath(ForTestCompileStdlib.stdlibJarForTests()); 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()) { if (!junitJar.exists()) {
throw new AssertionError(); throw new AssertionError();
@@ -82,8 +82,8 @@ public class TestlibTest extends CodegenTestCase {
myEnvironment.addToClasspath(junitJar); myEnvironment.addToClasspath(junitJar);
CoreLocalFileSystem localFileSystem = myEnvironment.getLocalFileSystem(); CoreLocalFileSystem localFileSystem = myEnvironment.getLocalFileSystem();
session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../testlib/test")); session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/testlib/test"));
session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../kunit/src")); session.addSources(localFileSystem.findFileByPath(JetParsingTest.getTestDataDir() + "/../../libraries/kunit/src"));
if (!session.analyze(System.err, MessageRenderer.PLAIN)) { if (!session.analyze(System.err, MessageRenderer.PLAIN)) {
throw new RuntimeException("There were compilation errors"); throw new RuntimeException("There were compilation errors");