use mock JDK from IDEA repo
This commit is contained in:
@@ -3,6 +3,5 @@
|
|||||||
<unzip dest="ideaSDK">
|
<unzip dest="ideaSDK">
|
||||||
<fileset dir="ideaSDK" includes="ideaIC*.zip"/>
|
<fileset dir="ideaSDK" includes="ideaIC*.zip"/>
|
||||||
</unzip>
|
</unzip>
|
||||||
<echo file="idea/idea.properties" message="idea.home=${basedir}/ideaSDK"/>
|
|
||||||
</target>
|
</target>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -15,8 +15,6 @@ import org.jetbrains.jet.lang.types.*;
|
|||||||
import org.jetbrains.jet.parsing.JetParsingTest;
|
import org.jetbrains.jet.parsing.JetParsingTest;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileReader;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -118,16 +116,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Sdk jdkFromIdeaHome() {
|
public static Sdk jdkFromIdeaHome() {
|
||||||
Properties properties = new Properties();
|
return new JavaSdkImpl().createJdk("JDK", "idea/testData/mockJDK-1.7/jre", true);
|
||||||
try {
|
|
||||||
FileReader reader = new FileReader(getHomeDirectory() + "/idea/idea.properties");
|
|
||||||
properties.load(reader);
|
|
||||||
reader.close();
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
String home = properties.getProperty("idea.home");
|
|
||||||
return new JavaSdkImpl().createJdk("JDK", home + "/java/mockJDK-1.7/jre", true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getHomeDirectory() {
|
private static String getHomeDirectory() {
|
||||||
|
|||||||
Reference in New Issue
Block a user