From 7b5cf6fe7da9aac9af51d2a6cd410407a9cb17ad Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sun, 19 Jun 2016 03:54:59 -0400 Subject: add plugin builds and scalatest example build to being compiled in tests --- circle.yml | 2 -- test/build/build.scala | 2 +- test/test.scala | 5 +++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 64d62c0..6187f81 100644 --- a/circle.yml +++ b/circle.yml @@ -9,10 +9,8 @@ dependencies: - ./cbt compile - ./cbt direct - ./cbt -Dlog=all - - cd plugins/scalatest/ && ../../cbt compile && cd ../../ test: override: - ./cbt direct test - ./cbt test - - cd examples/build-scalatest && ../../cbt test && cd ../.. diff --git a/test/build/build.scala b/test/build/build.scala index aef96a6..5a138fb 100644 --- a/test/build/build.scala +++ b/test/build/build.scala @@ -1,4 +1,4 @@ import cbt._ class Build(val context: cbt.Context) extends BaseBuild{ - override def dependencies = Seq( context.cbtDependency ) ++ super.dependencies + override def dependencies = super.dependencies :+ context.cbtDependency } diff --git a/test/test.scala b/test/test.scala index 5a4392f..8c609dd 100644 --- a/test/test.scala +++ b/test/test.scala @@ -156,6 +156,11 @@ object Main{ usage("simple-fixed") compile("simple-fixed") + compile("../plugins/sbt_layout") + compile("../plugins/scalajs") + compile("../plugins/scalatest") + compile("../examples/scalatest-example") + System.err.println(" DONE!") System.err.println( successes.toString ++ " succeeded, "++ failures.toString ++ " failed" ) if(failures > 0) System.exit(1) else System.exit(0) -- cgit v1.2.3