Fixed a bunch of tests, and minor bugs

5 files changed, 8 insertions, 8 deletions

diff --git a/test/errors/gender/ReadOutput.fir b/test/errors/gender/ReadOutput.fir
index fd3607d0..f9e8f7b4 100644
--- a/test/errors/gender/ReadOutput.fir
+++ b/test/errors/gender/ReadOutput.fir
@@ -1,5 +1,5 @@
 ; RUN: firrtl -i %s -o %s.v -X verilog -p c 2>&1 | tee %s.out | FileCheck %s
-; CHECK: Expression out$y is used as a sink but can only be used as a source.
+; CHECK: Expression out is used as a source but can only be used as a sink.
 
 circuit BTB :
   module BTB : 
diff --git a/test/errors/high-form/Flip-Mem.fir b/test/errors/high-form/Flip-Mem.fir
index ebc3ddbf..a8cb67ca 100644
--- a/test/errors/high-form/Flip-Mem.fir
+++ b/test/errors/high-form/Flip-Mem.fir
@@ -1,6 +1,5 @@
 ; RUN: firrtl -i %s -o %s.v -X verilog -p c 2>&1 | tee %s.out | FileCheck %s
 ; CHECK: Memory mc cannot be a bundle type with flips.
-; CHECK: Memory ms cannot be a bundle type with flips.
 
 circuit Flip-Mem : 
   module Flip-Mem : 
diff --git a/test/errors/high-form/InvalidSubexp.fir b/test/errors/high-form/InvalidSubexp.fir
index 23c155e2..d0ad34c0 100644
--- a/test/errors/high-form/InvalidSubexp.fir
+++ b/test/errors/high-form/InvalidSubexp.fir
@@ -1,6 +1,6 @@
 ; RUN: firrtl -i %s -o %s.v -X verilog -p c 2>&1 | tee %s.out | FileCheck %s
-; CHECK: Invalid index access to non-reference.
-; CHECK: Invalid subfield access to non-reference.
+; CHECK: Invalid access to non-reference.
+; CHECK: Invalid access to non-reference.
 
 circuit Top :
   module Top :
diff --git a/test/errors/high-form/Printf.fir b/test/errors/high-form/Printf.fir
index 7f285d3e..5580182b 100644
--- a/test/errors/high-form/Printf.fir
+++ b/test/errors/high-form/Printf.fir
@@ -4,9 +4,10 @@ circuit Top :
   module Top : 
     input x : {y : UInt<1>}
     input p : UInt<1>
-    printf("Hello World%!\n",x)
-    printf("Hello World%")
-    printf("Hello World%d %s %h %x",x,x,x)
+    input clk : Clock
+    printf(clk,p,"Hello World%!\n",x)
+    printf(clk,p,"Hello World%")
+    printf(clk,p,"Hello World%d %s %h %x",x,x,x)
 
 ;CHECK: Bad printf format: "%!"
 ;CHECK: Bad printf format: trailing "%"
diff --git a/test/errors/parser/InstanceNotRef.fir b/test/errors/parser/InstanceNotRef.fir
index a6996fee..0760f168 100644
--- a/test/errors/parser/InstanceNotRef.fir
+++ b/test/errors/parser/InstanceNotRef.fir
@@ -1,5 +1,5 @@
 ; RUN: firrtl -i %s -o %s.flo -x X -p c | tee %s.out | FileCheck %s
-; CHECK: FIRRTL Parsing Error: Expected a reference expression here.
+; CHECK: FIRRTL Parsing Error: Expected a statement here.
 
 circuit Top :
   module Top :