diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2016-05-05 23:10:03 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2016-05-05 23:10:03 +1000 |
commit | a46af82b025e0dde3714ab8cbe5e76afafd7ab18 (patch) | |
tree | 82ac025ce1e9d9789d0950823f625176e9b50877 /src/partest-extras/scala/tools/partest | |
parent | 2726320779356be1829aa1715888872606aa819b (diff) | |
parent | 30d6fce50aba1d73173339b0add4808bc13b1c40 (diff) | |
download | scala-a46af82b025e0dde3714ab8cbe5e76afafd7ab18.tar.gz scala-a46af82b025e0dde3714ab8cbe5e76afafd7ab18.tar.bz2 scala-a46af82b025e0dde3714ab8cbe5e76afafd7ab18.zip |
Merge pull request #5112 from lrytz/dropRecursiveClasspath
Remove legacy recursive classpath implementation
Diffstat (limited to 'src/partest-extras/scala/tools/partest')
-rw-r--r-- | src/partest-extras/scala/tools/partest/BytecodeTest.scala | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/partest-extras/scala/tools/partest/BytecodeTest.scala b/src/partest-extras/scala/tools/partest/BytecodeTest.scala index 290b7b434e..532dfd2a73 100644 --- a/src/partest-extras/scala/tools/partest/BytecodeTest.scala +++ b/src/partest-extras/scala/tools/partest/BytecodeTest.scala @@ -1,10 +1,10 @@ package scala.tools.partest -import scala.tools.nsc.util.JavaClassPath import scala.collection.JavaConverters._ -import scala.tools.asm.{ClassWriter, ClassReader} +import scala.tools.asm.{ClassReader, ClassWriter} import scala.tools.asm.tree._ -import java.io.{File => JFile, InputStream} +import java.io.{InputStream, File => JFile} + import AsmNode._ /** @@ -125,12 +125,16 @@ abstract class BytecodeTest { cn } - protected lazy val classpath: JavaClassPath = { - import scala.tools.nsc.util.ClassPath.DefaultJavaContext + protected lazy val classpath: scala.tools.nsc.util.ClassPath = { + import scala.tools.nsc.classpath.AggregateClassPath + import scala.tools.nsc.classpath.ClassPathFactory import scala.tools.util.PathResolver.Defaults + import scala.tools.nsc.Settings // logic inspired by scala.tools.util.PathResolver implementation - val containers = DefaultJavaContext.classesInExpandedPath(Defaults.javaUserClassPath) - new JavaClassPath(containers, DefaultJavaContext) + // `Settings` is used to check YdisableFlatCpCaching in ZipArchiveFlatClassPath + val factory = new ClassPathFactory(new Settings()) + val containers = factory.classesInExpandedPath(Defaults.javaUserClassPath) + new AggregateClassPath(containers) } } |