Imported Upstream version 2012.02.22upstream-weekly/2012.02.22

1 files changed, 6 insertions, 6 deletions

diff --git a/test/switch3.go b/test/switch3.go
index e91499db0..404b62e39 100644
--- a/test/switch3.go
+++ b/test/switch3.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
@@ -15,31 +15,31 @@ func bad() {
 	var s string
 
 	switch i {
-	case s: // ERROR "mismatched types string and I"
+	case s: // ERROR "mismatched types string and I|incompatible types"
 	}
 
 	switch s {
-	case i: // ERROR "mismatched types I and string"
+	case i: // ERROR "mismatched types I and string|incompatible types"
 	}
 
 	var m, m1 map[int]int
 	switch m {
 	case nil:
-	case m1: // ERROR "can only compare map m to nil"
+	case m1: // ERROR "can only compare map m to nil|map can only be compared to nil"
 	default:
 	}
 
 	var a, a1 []int
 	switch a {
 	case nil:
-	case a1: // ERROR "can only compare slice a to nil"
+	case a1: // ERROR "can only compare slice a to nil|slice can only be compared to nil"
 	default:
 	}
 
 	var f, f1 func()
 	switch f {
 	case nil:
-	case f1: // ERROR "can only compare func f to nil"
+	case f1: // ERROR "can only compare func f to nil|func can only be compared to nil"
 	default:
 	}
 }