With the changes to support automatic forward declarations of

type names, gccgo no longer reports redefinition errors for
:=, because it no longer knows at parse time whether the type
has changed.  Adjust this test to not match "redefinition",
and to instead match gccgo's current output.

declbad.go:19:3: error: variables redeclared but no variable is new
declbad.go:34:3: error: variables redeclared but no variable is new
declbad.go:39:3: error: variables redeclared but no variable is new
declbad.go:44:3: error: variables redeclared but no variable is new
declbad.go:49:3: error: variables redeclared but no variable is new
declbad.go:24:3: error: incompatible types in assignment
declbad.go:29:3: error: incompatible types in assignment
declbad.go:39:3: error: incompatible types in assignment

R=rsc
DELTA=10  (0 added, 0 deleted, 10 changed)
OCL=33537
CL=33539

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