Improve integration test API and add support for Verilog resources

Change integration tests to be classes that extend abstract classes. This
allows them to be run in parallel. Also expand API to support Verilog
resources in integration tests.

1 files changed, 6 insertions, 23 deletions

diff --git a/src/test/scala/firrtlTests/IntegrationSpec.scala b/src/test/scala/firrtlTests/IntegrationSpec.scala
index e99a6e36..dd456589 100644
--- a/src/test/scala/firrtlTests/IntegrationSpec.scala
+++ b/src/test/scala/firrtlTests/IntegrationSpec.scala
@@ -30,28 +30,11 @@ package firrtlTests
 import org.scalatest._
 import org.scalatest.prop._
 
-class IntegrationSpec extends FirrtlPropSpec {
+class GCDExecutionTest extends ExecutionTest("GCDTester", "/integration")
+class RightShiftExecutionTest extends ExecutionTest("RightShiftTester", "/integration")
+class MemExecutionTest extends ExecutionTest("MemTester", "/integration")
 
-  case class Test(name: String, dir: String)
+class RocketCompilationTest extends CompilationTest("rocket", "/regress")
+class RocketFirrtlCompilationTest extends CompilationTest("rocket-firrtl", "/regress")
+class BOOMRobCompilationTest extends CompilationTest("Rob", "/regress")
 
-  val runTests = Seq(Test("GCDTester", "/integration"),
-                     Test("RightShiftTester", "/integration"),
-                     Test("MemTester", "/integration"))
-      
-
-  runTests foreach { test =>
-    property(s"${test.name} should execute correctly") {
-      runFirrtlTest(test.name, test.dir)
-    }
-  }
-
-  val compileTests = Seq(Test("rocket", "/regress"),
-                         Test("rocket-firrtl", "/regress"),
-                         Test("Rob", "/regress"))
-
-  compileTests foreach { test =>
-    property(s"${test.name} should compile to Verilog") {
-      compileFirrtlTest(test.name, test.dir)
-    }
-  }
-}