From de96a55c3267bb1508e77a6815007807e3fd73fb Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 14 Jan 2018 04:25:56 -0800 Subject: Some tweaks to get tests passing... --- integration/src/test/resources/jawn/build.sc | 2 +- integration/src/test/scala/mill/integration/IntegrationTestSuite.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'integration/src') diff --git a/integration/src/test/resources/jawn/build.sc b/integration/src/test/resources/jawn/build.sc index b57227e7..161f302a 100644 --- a/integration/src/test/resources/jawn/build.sc +++ b/integration/src/test/resources/jawn/build.sc @@ -33,7 +33,7 @@ class JawnModule(crossVersion: String) extends mill.Module{ def projectDeps = Seq(parser, util) def testProjectDeps = Seq(parser.test, util.test) } - class Support(ivyDeps0: Dep*)(implicit ctx: mill.mill.define.Ctx) extends JawnModule{ + class Support(ivyDeps0: Dep*)(implicit ctx: mill.define.Ctx) extends JawnModule{ def projectDeps = Seq[Module](parser) def ivyDeps = Agg.from(ivyDeps0) } diff --git a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala index 82f4de72..ba4415fa 100644 --- a/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala +++ b/integration/src/test/scala/mill/integration/IntegrationTestSuite.scala @@ -8,7 +8,7 @@ import utest._ abstract class IntegrationTestSuite(repoKey: String, workspaceSlug: String) extends TestSuite{ val workspacePath = pwd / 'target / 'workspace / workspaceSlug val buildFilePath = pwd / 'integration / 'src / 'test / 'resources / workspaceSlug - val stdOutErr = System.out//new PrintStream(new ByteArrayOutputStream()) + val stdOutErr = new PrintStream(new ByteArrayOutputStream()) val stdIn = new ByteArrayInputStream(Array()) val runner = new mill.main.MainRunner( ammonite.main.Cli.Config(wd = workspacePath), false, -- cgit v1.2.3