From 49fca68c4f01b4fee6e9ebb9b4fae00dd349c5f4 Mon Sep 17 00:00:00 2001
From: Chick Markley
Date: Thu, 6 Jul 2017 14:58:24 -0700
Subject: Fixed inability to disable combo loop check (#619)

* Fixed inability to disable combo loop check
Moved checking of dontCheckComboLoops into loadAnnotations so
that it works in cases where Driver.execute is not used.

* Fix test for annotations, modifications to loadAnnotations
made 2 more annotations visible.

* Remove debug println from DriverSpec
---
 src/test/scala/firrtlTests/DriverSpec.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/test')

diff --git a/src/test/scala/firrtlTests/DriverSpec.scala b/src/test/scala/firrtlTests/DriverSpec.scala
index 377353dc..e3164f89 100644
--- a/src/test/scala/firrtlTests/DriverSpec.scala
+++ b/src/test/scala/firrtlTests/DriverSpec.scala
@@ -137,7 +137,7 @@ class DriverSpec extends FreeSpec with Matchers with BackendCompilationUtilities
     copyResourceToFile("/annotations/SampleAnnotations.anno", annotationsTestFile)
     optionsManager.firrtlOptions.annotations.length should be (0)
     Driver.loadAnnotations(optionsManager)
-    optionsManager.firrtlOptions.annotations.length should be (10) // 9 from circuit plus 1 for targetDir
+    optionsManager.firrtlOptions.annotations.length should be (12) // 9 from circuit plus 3 general purpose
 
     optionsManager.firrtlOptions.annotations.head.transformClass should be ("firrtl.passes.InlineInstances")
     annotationsTestFile.delete()
-- 
cgit v1.2.3