From d6573e2238c72de1ffbc344a962a0cfaa557f983 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 26 Nov 2017 16:28:11 -0800 Subject: Get acyclic's tests running after compilation failures, fixing a metadata.mill.json invalidation bug --- .../src/test/scala/mill/scalaplugin/AcyclicTests.scala | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'scalaplugin/src/test') diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala index 61da0a47..4f41de9a 100644 --- a/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala +++ b/scalaplugin/src/test/scala/mill/scalaplugin/AcyclicTests.scala @@ -85,30 +85,22 @@ object AcyclicTests extends TestSuite{ // Compilation can fail on broken code, and work when fixed write.append(packageScala, "\n}}") val Left(Result.Exception(ex)) = eval(AcyclicBuild.acyclic("2.12.4").compile) - assert(ex.isInstanceOf[sbt.internal.inc.CompileFailed]) write.write(packageScala, read(packageScala).dropRight(3)) - val Right(_) = eval(AcyclicBuild.acyclic("2.12.4").compile) - // Still doesn't work =( - // val Right(_) = eval(AcyclicBuild.acyclic("2.12.4").test.forkTest()) - } - - 'tests - { - // Tests can run + // Tests compile & run val Right(_) = eval(AcyclicBuild.acyclic("2.12.4").test.forkTest()) - // Be broken + // Tests can be broken write.append(packageScala, "\n}}") - eval(AcyclicBuild.acyclic("2.12.4").test.compile) val Left(_) = eval(AcyclicBuild.acyclic("2.12.4").test.forkTest()) - // And run again when fixed + // Tests can be fixed write.write(packageScala, read(packageScala).dropRight(3)) - val Right(_) = eval(AcyclicBuild.acyclic("2.12.4").test.forkTest()) } + } } -- cgit v1.2.3