diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/settings/ScalaSettings.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/util/PathResolver.scala | 5 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/PartestDefaults.scala | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala index 4a54dab75a..10ba5b200a 100644 --- a/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/ScalaSettings.scala @@ -28,7 +28,7 @@ trait ScalaSettings extends AbsScalaSettings * - Otherwise, if CLASSPATH is set, it is that * - If neither of those, then "." is used. */ - protected def defaultClasspath = Option(sys.props("CLASSPATH")) getOrElse "." + protected def defaultClasspath = sys.env.getOrElse("CLASSPATH", ".") /** Disable a setting */ def disable(s: Setting) = allSettings -= s diff --git a/src/compiler/scala/tools/util/PathResolver.scala b/src/compiler/scala/tools/util/PathResolver.scala index c5d0e1edea..788891a062 100644 --- a/src/compiler/scala/tools/util/PathResolver.scala +++ b/src/compiler/scala/tools/util/PathResolver.scala @@ -205,10 +205,7 @@ class PathResolver(settings: Settings, context: JavaContext) { def userClassPath = ( if (!settings.classpath.isDefault) settings.classpath.value - else sys.props("CLASSPATH") match { - case null => "." - case cp => cp - } + else sys.env.getOrElse("CLASSPATH", ".") ) import context._ diff --git a/src/partest/scala/tools/partest/PartestDefaults.scala b/src/partest/scala/tools/partest/PartestDefaults.scala index 7548b3ef3b..0ac9f6255a 100644 --- a/src/partest/scala/tools/partest/PartestDefaults.scala +++ b/src/partest/scala/tools/partest/PartestDefaults.scala @@ -14,7 +14,7 @@ object PartestDefaults { def srcDirName = propOrElse("partest.srcdir", "files") def testRootDir = testRootName map (x => Directory(x)) - def classPath = PathResolver.Environment.javaUserClassPath // XXX + def classPath = propOrElse("partest.classpath", "") def javaCmd = propOrElse("partest.javacmd", "java") def javacCmd = propOrElse("partest.javac_cmd", "javac") |