Merge remote-tracking branch 'origin/master' into kind-projector-plugin

1 files changed, 15 insertions, 2 deletions

diff --git a/test/test.scala b/test/test.scala
index 81a164f..55ce205 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -35,8 +35,15 @@ object Main{
       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)
+      p.waitFor() match {
+        case 0 =>
+          ()
+
+        case 127 => // bash exit code: not found
+          System.err.println( "Shellcheck not found. Your build may fail during ci-build" )
+
+        case _ =>
+          throw new Exception( "Linting error in ./cbt bash launcher script:\n" + errors )
       }
     } else System.err.println( "Skipping shellcheck" )
 
@@ -422,6 +429,12 @@ object Main{
     }
 
     {
+      val res = runCbt("../examples/new-style-macros-example", Seq("run"))
+      assert(res.exit0)
+      assert(res.out.contains("hello, world!"), res.out)
+    }
+
+    {
       val res = runCbt("../examples/resources-example", Seq("run"))
       assert(res.exit0)
       assert(res.out.contains("via parent.parent: false 0"), res.out)