Recognize gcco error messages.

declbad.go:15:3: error: variables redeclared but no variable is new
declbad.go:20:3: error: redefinition of 'f'
declbad.go:19:3: note: previous definition of 'f' was here
declbad.go:25:3: error: redefinition of 'i'
declbad.go:24:3: note: previous definition of 'i' was here
declbad.go:30:3: error: variables redeclared but no variable is new
declbad.go:35:3: error: redefinition of 'i'
declbad.go:34:3: note: previous definition of 'i' was here
declbad.go:40:3: error: variables redeclared but no variable is new
declbad.go:45:3: error: variables redeclared but no variable is new

R=r
DELTA=10  (0 added, 0 deleted, 10 changed)
OCL=27934
CL=27957

diff --git a/test/declbad.go b/test/declbad.go
index 755450788ecd5a9c052537d9a0f35c898105267f..7f6e56d7e44e42ee9ff54fbd9e08446681c01565 100644 (file)
--- a/test/declbad.go
+++ b/test/declbad.go
@@ -16,36 +16,36 @@ func main() {
        {
                // simple redeclaration
                i := f1();
-               i := f1();      // ERROR "redeclared"
+               i := f1();      // ERROR "redeclared|redefinition"
        }
        {
                // change of type for f
-               i, f, s := f3();
-               f, g, t := f3();        // ERROR "redeclared"
+               i, f, s := f3();        // GCCGO_ERROR "previous"
+               f, g, t := f3();        // ERROR "redeclared|redefinition"
        }
        {
                // change of type for i
-               i, f, s := f3();
-               j, i, t := f3();        // ERROR "redeclared"
+               i, f, s := f3();        // GCCGO_ERROR "previous"
+               j, i, t := f3();        // ERROR "redeclared|redefinition"
        }
        {
                // no new variables
                i, f, s := f3();
-               i, f := f2();   // ERROR "redeclared"
+               i, f := f2();   // ERROR "redeclared|redefinition"
        }
        {
                // single redeclaration
-               i, f, s := f3();
-               i := f1();      // ERROR "redeclared"
+               i, f, s := f3();        // GCCGO_ERROR "previous"
+               i := f1();              // ERROR "redeclared|redefinition"
        }
                // double redeclaration
        {
                i, f, s := f3();
-               i, f := f2();   // ERROR "redeclared"
+               i, f := f2();   // ERROR "redeclared|redefinition"
        }
        {
                // triple redeclaration
                i, f, s := f3();
-               i, f, s := f3();        // ERROR "redeclared"
+               i, f, s := f3();        // ERROR "redeclared|redefinition"
        }
 }