From beb67ebad0799bc30ecd6b99601ed6aa8f501892 Mon Sep 17 00:00:00 2001
From: Henry Cook
Date: Fri, 6 Nov 2015 10:55:39 -0800
Subject: Fix counter tests

---
 src/test/scala/chiselTests/Counter.scala | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/test/scala/chiselTests/Counter.scala')

diff --git a/src/test/scala/chiselTests/Counter.scala b/src/test/scala/chiselTests/Counter.scala
index 080130df..d1ea0dd7 100644
--- a/src/test/scala/chiselTests/Counter.scala
+++ b/src/test/scala/chiselTests/Counter.scala
@@ -8,17 +8,18 @@ import Chisel.testers.BasicTester
 
 class CountTester(max: Int) extends BasicTester {
   val cnt = Counter(max)
-  when(cnt.value === UInt(max)) { io.done := Bool(true) }
+  when(Bool(true)) { cnt.inc() }
+  when(cnt.value === UInt(max-1)) { io.done := Bool(true) }
 }
 
 class EnableTester(seed: Int) extends BasicTester {
   val ens = Reg(init = UInt(seed))
   ens := ens >> 1
   val (cntEn, cntWrap) = Counter(ens(0), 32)
-  val cnt = Counter(32)
-  when(cnt.value === UInt(31)) {
+  val cnt = Counter(Bool(true), 32)._1
+  when(cnt === UInt(30)) {
     io.done := Bool(true)
-    io.error := cnt.value != UInt(popCount(seed))
+    io.error := cnt != UInt(popCount(seed))
   }
 }
 
-- 
cgit v1.2.3


From 7fe61318433a8ecaac80ef2b547a88ab9dc04aec Mon Sep 17 00:00:00 2001
From: Henry Cook
Date: Fri, 6 Nov 2015 13:23:24 -0800
Subject: added elaboration tests for remaining old Chisel3 examples

---
 src/test/scala/chiselTests/Counter.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/test/scala/chiselTests/Counter.scala')

diff --git a/src/test/scala/chiselTests/Counter.scala b/src/test/scala/chiselTests/Counter.scala
index d1ea0dd7..1aa2aaba 100644
--- a/src/test/scala/chiselTests/Counter.scala
+++ b/src/test/scala/chiselTests/Counter.scala
@@ -17,7 +17,7 @@ class EnableTester(seed: Int) extends BasicTester {
   ens := ens >> 1
   val (cntEn, cntWrap) = Counter(ens(0), 32)
   val cnt = Counter(Bool(true), 32)._1
-  when(cnt === UInt(30)) {
+  when(cnt === UInt(31)) {
     io.done := Bool(true)
     io.error := cnt != UInt(popCount(seed))
   }
-- 
cgit v1.2.3