diff options
Diffstat (limited to 'src/partest/scala/tools/partest/PartestTask.scala')
-rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index 67b38d2e24..2f694b3cc8 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -279,6 +279,16 @@ class PartestTask extends Task with CompilationPathProperty { } } getOrElse sys.error("Provided classpath does not contain a Scala library.") + val scalaReflect = { + (classpath.list map { fs => new File(fs) }) find { f => + f.getName match { + case "scala-reflect.jar" => true + case "reflect" if (f.getParentFile.getName == "classes") => true + case _ => false + } + } + } getOrElse sys.error("Provided classpath does not contain a Scala reflection library.") + val scalaCompiler = { (classpath.list map { fs => new File(fs) }) find { f => f.getName match { @@ -342,6 +352,7 @@ class PartestTask extends Task with CompilationPathProperty { antFileManager.failed = runFailed antFileManager.CLASSPATH = ClassPath.join(classpath.list: _*) antFileManager.LATEST_LIB = scalaLibrary.getAbsolutePath + antFileManager.LATEST_REFLECT = scalaReflect.getAbsolutePath antFileManager.LATEST_COMP = scalaCompiler.getAbsolutePath antFileManager.LATEST_PARTEST = scalaPartest.getAbsolutePath antFileManager.LATEST_ACTORS = scalaActors.getAbsolutePath |