summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-11-26 13:58:24 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-11-26 13:58:24 -0800
commit4219303cb85c5f892c548b129d6350a20df51518 (patch)
treee32c7538aa6fed2c48289d987a6044662925c5f1
parent7bd320dcd9a1bfc59a80bc8237d293ee44b28f77 (diff)
downloadmill-4219303cb85c5f892c548b129d6350a20df51518.tar.gz
mill-4219303cb85c5f892c548b129d6350a20df51518.tar.bz2
mill-4219303cb85c5f892c548b129d6350a20df51518.zip
Isolate TestRunner classloader to try and get AcyclicTests working...
-rw-r--r--scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala4
-rw-r--r--scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala4
2 files changed, 5 insertions, 3 deletions
diff --git a/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala b/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
index 2d0495e4..09e41a74 100644
--- a/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
+++ b/scalaplugin/src/main/scala/mill/scalaplugin/TestRunner.scala
@@ -43,7 +43,9 @@ object TestRunner {
testClassfilePath: Seq[Path],
args: Seq[String]): mill.eval.Result[Unit] = {
val outerClassLoader = getClass.getClassLoader
- val cl = new URLClassLoader(entireClasspath.map(_.toIO.toURI.toURL).toArray){
+ val cl = new URLClassLoader(
+ entireClasspath.map(_.toIO.toURI.toURL).toArray,
+ ClassLoader.getSystemClassLoader().getParent()){
override def findClass(name: String) = {
if (name.startsWith("sbt.testing.")){
outerClassLoader.loadClass(name)
diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala
index 97ca4d0b..0fc7d4af 100644
--- a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala
+++ b/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala
@@ -21,7 +21,7 @@ object AcyclicBuild{
def version = "0.1.7"
override def sources = basePath/'src/'main/'scala
def scalaVersion = crossVersion
- override def compileIvyDeps = Seq(
+ override def ivyDeps = Seq(
Dep.Java("org.scala-lang", "scala-compiler", scalaVersion())
)
object test extends this.Tests{
@@ -91,7 +91,7 @@ object AcyclicTests extends TestSuite{
val Right((_, _)) = eval(AcyclicBuild.acyclic("2.12.4").compile)
- // Tests can run
+// Tests can run
// val Right((_, _)) = eval(AcyclicBuild.acyclic("2.12.4").test.test())
}
}