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)