summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2008-10-24 16:21:09 +0000
committerPhilipp Haller <hallerp@gmail.com>2008-10-24 16:21:09 +0000
commite444ec4d074addc1984323b6a9c29bf0f652d2c7 (patch)
tree783c4b6fd2764c7b2a958e82b74c89f8e2f8acde
parentdb0a4322bafc962ae8b178d977eb7dabec5418fb (diff)
downloadscala-e444ec4d074addc1984323b6a9c29bf0f652d2c7.tar.gz
scala-e444ec4d074addc1984323b6a9c29bf0f652d2c7.tar.bz2
scala-e444ec4d074addc1984323b6a9c29bf0f652d2c7.zip
Fixed problem with partest-created compilers no...
Fixed problem with partest-created compilers not finding scala package.
-rw-r--r--src/partest/scala/tools/partest/nest/CompileManager.scala9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala
index cd12b0b5c3..b35e5e6079 100644
--- a/src/partest/scala/tools/partest/nest/CompileManager.scala
+++ b/src/partest/scala/tools/partest/nest/CompileManager.scala
@@ -24,9 +24,10 @@ abstract class SimpleCompiler {
def compile(file: File, kind: String, log: File): Boolean
}
-class TestSettings extends {
+class TestSettings(fileMan: FileManager) extends {
override val bootclasspathDefault =
- System.getProperty("sun.boot.class.path", "")
+ System.getProperty("sun.boot.class.path", "") + File.pathSeparator +
+ fileMan.LATEST_LIB
override val extdirsDefault =
System.getProperty("java.ext.dirs", "")
} with Settings(x => ())
@@ -36,7 +37,7 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
new Global(settings, reporter)
def newGlobal(settings: Settings, logWriter: FileWriter): Global = {
- val rep = new ExtConsoleReporter(new TestSettings,
+ val rep = new ExtConsoleReporter(new TestSettings(fileManager),
Console.in,
new PrintWriter(logWriter))
rep.shortname = true
@@ -44,7 +45,7 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
}
def newSettings = {
- val settings = new TestSettings
+ val settings = new TestSettings(fileManager)
settings.deprecation.value = true
settings.nowarnings.value = false
settings.encoding.value = "iso-8859-1"