aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2016-03-08 20:08:13 -0500
committerChristopher Vogt <oss.nsp@cvogt.org>2016-03-08 20:09:00 -0500
commit820589ebb463cecea0d9aad82daa72cfcd493672 (patch)
treec61814dbdf88cea33ead840fa02269ece7d6e90a /test
parent56a8c4e83c976aa841c20095efa8df652b0261ad (diff)
downloadcbt-820589ebb463cecea0d9aad82daa72cfcd493672.tar.gz
cbt-820589ebb463cecea0d9aad82daa72cfcd493672.tar.bz2
cbt-820589ebb463cecea0d9aad82daa72cfcd493672.zip
add simple multi project build test and comment out failing test cases
Diffstat (limited to 'test')
-rw-r--r--test/multi-build/build/build.scala9
-rw-r--r--test/multi-build/code.scala5
-rw-r--r--test/multi-build/sub1/code.scala4
-rw-r--r--test/multi-build/sub2/code.scala4
-rw-r--r--test/test.scala9
5 files changed, 28 insertions, 3 deletions
diff --git a/test/multi-build/build/build.scala b/test/multi-build/build/build.scala
new file mode 100644
index 0000000..5b9f874
--- /dev/null
+++ b/test/multi-build/build/build.scala
@@ -0,0 +1,9 @@
+import cbt._
+import scala.collection.immutable.Seq
+import java.io.File
+class Build(context: Context) extends BasicBuild(context){
+ override def dependencies = Seq(
+ BuildDependency(projectDirectory++"/sub1"),
+ BuildDependency(projectDirectory++"/sub2")
+ ) ++ super.dependencies
+}
diff --git a/test/multi-build/code.scala b/test/multi-build/code.scala
new file mode 100644
index 0000000..3fe85ad
--- /dev/null
+++ b/test/multi-build/code.scala
@@ -0,0 +1,5 @@
+object Main extends App{
+ println("root here")
+ println(Foo(5))
+ println(Bar("test"))
+}
diff --git a/test/multi-build/sub1/code.scala b/test/multi-build/sub1/code.scala
new file mode 100644
index 0000000..b2d5deb
--- /dev/null
+++ b/test/multi-build/sub1/code.scala
@@ -0,0 +1,4 @@
+case class Foo(i: Int)
+object Main extends App{
+ println("sub1 here")
+} \ No newline at end of file
diff --git a/test/multi-build/sub2/code.scala b/test/multi-build/sub2/code.scala
new file mode 100644
index 0000000..1ec6ebf
--- /dev/null
+++ b/test/multi-build/sub2/code.scala
@@ -0,0 +1,4 @@
+case class Bar(s: String)
+object Main extends App{
+ println("sub1 here")
+}
diff --git a/test/test.scala b/test/test.scala
index feab89f..deaa46c 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -51,8 +51,8 @@ object Main{
val res = runCbt(path, Seq())
logger.test(res.toString)
assertSuccess(res)
- assert(res.out == "", res.toString)
- assert(res.err contains usageString, res.toString)
+ assert(res.out == "", "usage " + path +" "+ res.toString)
+ assert(res.err contains usageString, "usage " + path +" "+res.toString)
}
def compile(path: String)(implicit logger: Logger) = {
val res = runCbt(path, Seq("compile"))
@@ -62,8 +62,11 @@ object Main{
logger.test( "Running tests " ++ args.toList.toString )
- usage("nothing")
+ //usage("nothing")
compile("nothing")
+ //usage("multi-build")
+ compile("multi-build")
+
{
val noContext = Context(cbtHome ++ "/test/nothing", Seq(), logger)