From 897f9ca3d1bcdab3b92d5b02014a9d478d20c5fa Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 15 Apr 2011 18:21:52 -0400 Subject: [PATCH] in tests, allow access to loaded compiler classes if compiler on classpath --- testing/TestFramework.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/TestFramework.scala b/testing/TestFramework.scala index 449444ae1..6e3bdfe5d 100644 --- a/testing/TestFramework.scala +++ b/testing/TestFramework.scala @@ -188,7 +188,8 @@ object TestFramework } def createTestLoader(classpath: Seq[File], scalaInstance: ScalaInstance): ClassLoader = { - val filterCompilerLoader = new FilteredLoader(scalaInstance.loader, ScalaCompilerJarPackages) + val declaresCompiler = classpath.exists(_.getName contains "scala-compiler") + val filterCompilerLoader = if(declaresCompiler) scalaInstance.loader else new FilteredLoader(scalaInstance.loader, ScalaCompilerJarPackages) val interfaceFilter = (name: String) => name.startsWith("org.scalatools.testing.") val notInterfaceFilter = (name: String) => !interfaceFilter(name) val dual = new DualLoader(filterCompilerLoader, notInterfaceFilter, x => true, getClass.getClassLoader, interfaceFilter, x => false)