Merge pull request #423 from cvogt/chris

various changes

2 files changed, 12 insertions, 1 deletions

diff --git a/test/build/build.scala b/test/build/build.scala
index 9e02144..2777511 100644
--- a/test/build/build.scala
+++ b/test/build/build.scala
@@ -2,4 +2,5 @@ import cbt._
 class Build(val context: cbt.Context) extends BaseBuild{
   override def dependencies = super.dependencies :+ context.cbtDependency
   def apply = run
+  def args = context.args
 }
diff --git a/test/test.scala b/test/test.scala
index 4d1d7fb..bbecd94 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -14,17 +14,27 @@ object Main{
     implicit val logger: Logger = new Logger(args.enabledLoggers, System.currentTimeMillis)
     val lib = new Lib(logger)
     val cbtHome = new File(System.getenv("CBT_HOME"))
-    
 
     val slow = (
       System.getenv("CIRCLECI") != null // enable only on circle
       || args.args.contains("slow")
     )
     val compat = !args.args.contains("no-compat")
+    val shellcheck = !args.args.contains("no-shellcheck")
 
     if(!slow) System.err.println( "Skipping slow tests" )
     if(!compat) System.err.println( "Skipping cbt version compatibility tests" )
 
+    if(shellcheck){
+      val pb = new ProcessBuilder( "/usr/bin/env", "shellcheck", (cbtHome / "cbt").string )
+      val p = pb.start
+      val out = new java.io.InputStreamReader(p.getInputStream)
+      val errors = Iterator.continually(out.read).takeWhile(_ != -1).map(_.toChar).mkString
+      if( p.waitFor != 0 ){
+        throw new Exception("Linting error in ./cbt bash launcher script:\n" + errors)
+      }
+    } else System.err.println( "Skipping shellcheck" )
+
     var successes = 0
     var failures = 0
     def assertException[T:scala.reflect.ClassTag](msg: String = "")(code: => Unit)(implicit logger: Logger) = {