18 files changed, 19 insertions, 19 deletions
diff --git a/test/syntax/chan.go b/test/syntax/chan.go
index ff3577502..3b68bda35 100644
--- a/test/syntax/chan.go
+++ b/test/syntax/chan.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/chan1.go b/test/syntax/chan1.go
index 9c12e5e6f..868a1226d 100644
--- a/test/syntax/chan1.go
+++ b/test/syntax/chan1.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/else.go b/test/syntax/else.go
index 186d5959a..e985a9c09 100644
--- a/test/syntax/else.go
+++ b/test/syntax/else.go
@@ -1,4 +1,4 @@
-// errchk $G $D/$F.go
+// errorcheck
 
 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
@@ -8,5 +8,5 @@ package main
 
 func main() {
 	if true {
-	} else ;  // ERROR "else must be followed by if or statement block"
+	} else ;  // ERROR "else must be followed by if or statement block|expected .if. or .{."
 }
diff --git a/test/syntax/forvar.go b/test/syntax/forvar.go
index f12ce55ca..dc592d2b6 100644
--- a/test/syntax/forvar.go
+++ b/test/syntax/forvar.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/if.go b/test/syntax/if.go
index a3b51f0c0..b2a65f9a5 100644
--- a/test/syntax/if.go
+++ b/test/syntax/if.go
@@ -1,4 +1,4 @@
-// errchk $G $D/$F.go
+// errorcheck
 
 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/import.go b/test/syntax/import.go
index dd1f26134..f0a792126 100644
--- a/test/syntax/import.go
+++ b/test/syntax/import.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/interface.go b/test/syntax/interface.go
index a7f43533a..0b76b5416 100644
--- a/test/syntax/interface.go
+++ b/test/syntax/interface.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/semi1.go b/test/syntax/semi1.go
index 547d9bf79..8fbfb206a 100644
--- a/test/syntax/semi1.go
+++ b/test/syntax/semi1.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/semi2.go b/test/syntax/semi2.go
index 28d1d3906..cfb0ed17b 100644
--- a/test/syntax/semi2.go
+++ b/test/syntax/semi2.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/semi3.go b/test/syntax/semi3.go
index ab5941bda..645af7354 100644
--- a/test/syntax/semi3.go
+++ b/test/syntax/semi3.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/semi4.go b/test/syntax/semi4.go
index 7a9c2956e..e192348aa 100644
--- a/test/syntax/semi4.go
+++ b/test/syntax/semi4.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/semi5.go b/test/syntax/semi5.go
index 5f8ccc688..cf690f084 100644
--- a/test/syntax/semi5.go
+++ b/test/syntax/semi5.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/semi6.go b/test/syntax/semi6.go
index b6279ed30..c1e1cc363 100644
--- a/test/syntax/semi6.go
+++ b/test/syntax/semi6.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/semi7.go b/test/syntax/semi7.go
index 5a7b3ff4c..6c9ade8bc 100644
--- a/test/syntax/semi7.go
+++ b/test/syntax/semi7.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/topexpr.go b/test/syntax/topexpr.go
index 93d86fbe9..c5958f5dd 100644
--- a/test/syntax/topexpr.go
+++ b/test/syntax/topexpr.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/typesw.go b/test/syntax/typesw.go
index 47f683cdf..cd8cf3523 100644
--- a/test/syntax/typesw.go
+++ b/test/syntax/typesw.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2011 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/vareq.go b/test/syntax/vareq.go
index 8525be8cf..f08955e91 100644
--- a/test/syntax/vareq.go
+++ b/test/syntax/vareq.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
diff --git a/test/syntax/vareq1.go b/test/syntax/vareq1.go
index 9d70bea39..e900eabeb 100644
--- a/test/syntax/vareq1.go
+++ b/test/syntax/vareq1.go
@@ -1,4 +1,4 @@
-// errchk $G -e $D/$F.go
+// errorcheck
 
 // Copyright 2010 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style