Went ahead and implemented classpaths as descri...

Went ahead and implemented classpaths as described in email to
scala-internals on the theory that at this point I must know what I'm
doing.

** PUBLIC SERVICE ANNOUNCEMENT **

If your code of whatever kind stopped working with this commit (most
likely the error is something like "object scala not found") you can get
it working again with either of:

  passing -usejavacp on the command line
  set system property "scala.usejavacp" to "true"

Either of these will alert scala that you want the java application
classpath to be utilized by scala as well.

Review by community.

2 files changed, 2 insertions, 0 deletions

diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala
index f6746a8e3c..b030d14622 100644
--- a/src/partest/scala/tools/partest/nest/CompileManager.scala
+++ b/src/partest/scala/tools/partest/nest/CompileManager.scala
@@ -40,6 +40,7 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler {
 
   def newSettings(out: Option[String]) = {
     val settings = new TestSettings(fileManager)
+    settings.usejavacp.value = true
     settings.deprecation.value = true
     settings.nowarnings.value = false
     settings.encoding.value = "ISO-8859-1"    // XXX why?
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 992ceba99f..213123f711 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -257,6 +257,7 @@ class Worker(val fileManager: FileManager) extends Actor {
         "-classpath " + join(outDir.toString, CLASSPATH)
       ) ::: propertyOptions ::: List(
         "scala.tools.nsc.MainGenericRunner",
+        "-usejavacp",
         "Test",
         "jvm"
       )