Cleaned up displays in TutorialRunner

chick · chick · commit 6f00a90bc77a · 2016-06-02T22:14:48.000-07:00
diff --git a/src/main/scala/utils/TutorialRunner.scala b/src/main/scala/utils/TutorialRunner.scala
@@ -14,31 +14,40 @@ object TutorialRunner {
       args
     }
 
+    var successful = 0
     val errors = new ArrayBuffer[String]
     for(testName <- problemsToRun) {
       tutorialMap.get(testName) match {
         case Some(test) =>
-          println(s"running problem $testName")
+          println(s"Starting tutorial $testName")
           try {
-            if(! test(backendName)) {
-              errors += s"Problem $testName: test error occurred"
+            if(test(backendName)) {
+              successful += 1
+            }
+            else {
+              errors += s"Tutorial $testName: test error occurred"
             }
           }
           catch {
             case exception: Exception =>
               exception.printStackTrace()
-              errors += s"Problem $testName: exception ${exception.getMessage}"
+              errors += s"Tutorial $testName: exception ${exception.getMessage}"
             case t : Throwable =>
-              errors += s"Problem $testName: throwable ${t.getMessage}"
+              errors += s"Tutorial $testName: throwable ${t.getMessage}"
           }
         case _ =>
-          errors += s"Bad problem name: $testName"
+          errors += s"Bad tutorial name: $testName"
       }
 
     }
+    if(successful > 0) {
+      println(s"Tutorials passing: $successful")
+    }
     if(errors.nonEmpty) {
-      println(s"${errors.length} errors occurred" + ("=" * 60))
+      println("=" * 80)
+      println(s"Errors: ${errors.length}: in the following tutorials")
       println(errors.mkString("\n"))
+      println("=" * 80)
       System.exit(1)
     }
   }
diff --git a/src/test/scala/examples/Darken.scala b/src/test/scala/examples/Darken.scala
@@ -21,6 +21,7 @@ class DarkenTests(c: Darken, val infilename: String, val outfilename: String, b:
 class DarkenTester extends ChiselFlatSpec {
   "Darken" should "darken an image" in {
     runPeekPokeTester(() => new Darken()){
-      (c,b) => new DarkenTests(c, "src/test/resources/in.im24", "out.im24", b)}
+      (c,b) => new DarkenTests(c, "src/test/resources/in.im24", "out.im24", b)
+    } should be (true)
   }
 }
diff --git a/src/test/scala/examples/Launcher.scala b/src/test/scala/examples/Launcher.scala
@@ -2,8 +2,6 @@ package examples
 
 import Chisel.iotesters._
 import utils.TutorialRunner
-import scala.collection.mutable.ArrayBuffer
-import scala.collection.immutable.HashMap
 
 object Launcher {
   val examples = Map(
@@ -44,7 +42,7 @@ object Launcher {
       },
       "Darken" -> { (backendName: String) =>
         runPeekPokeTester(() => new Darken(), backendName) {
-          (c, b) => new DarkenTests(c, "../src/in.im24", "o" +
+          (c, b) => new DarkenTests(c, "src/test/resources/in.im24", "o" +
             "u,t.im24", b)
         }
       },

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ class DarkenTests(c: Darken, val infilename: String, val outfilename: String, b:`
`21`	`21`	`class DarkenTester extends ChiselFlatSpec {`
`22`	`22`	`"Darken" should "darken an image" in {`
`23`	`23`	`runPeekPokeTester(() => new Darken()){`
`24`		`- (c,b) => new DarkenTests(c, "src/test/resources/in.im24", "out.im24", b)}`
	`24`	`+ (c,b) => new DarkenTests(c, "src/test/resources/in.im24", "out.im24", b)`
	`25`	`+ } should be (true)`
`25`	`26`	`}`
`26`	`27`	`}`