test: match gccgo error messages

Added a return to bug357.go to avoid an error which gccgo
reports but 6g does not.

bug353.go:16:14: error: reference to undefined identifer ‘io.ReadWriterCloser’

bug357.go:18:2: error: value computed is not used

bug358.go:14:11: error: imported and not used: ioutil
bug358.go:19:9: error: invalid use of type

bug359.go:25:14: error: redefinition of ‘a’
bug359.go:25:6: note: previous definition of ‘a’ was here
bug359.go:19:6: error: incompatible type in initialization (implicit assignment of ‘list.List’ hidden field ‘front’)

bug362.go:13:6: error: iota is only defined in const declarations
bug362.go:14:6: error: iota is only defined in const declarations
bug362.go:15:6: error: iota is only defined in const declarations

bug363.go:13:12: error: shift of non-integer operand
bug363.go:16:12: error: shift of non-integer operand

bug365.go:15:8: error: expected package

R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/5078046

diff --git a/test/fixedbugs/bug353.go b/test/fixedbugs/bug353.go
index 46f5c36cb3c7964cb7af3c99267298049368e78b..b59d97f33842d822b285c0469e491a18436a177e 100644 (file)
--- a/test/fixedbugs/bug353.go
+++ b/test/fixedbugs/bug353.go
@@ -13,7 +13,7 @@ import (
        "os"
 )
 
-func echo(fd io.ReadWriterCloser) { // ERROR "undefined: io.ReadWriterCloser"
+func echo(fd io.ReadWriterCloser) { // ERROR "undefined.*io.ReadWriterCloser"
        var buf [1024]byte
        for {
                n, err := fd.Read(buf)

diff --git a/test/fixedbugs/bug357.go b/test/fixedbugs/bug357.go
index 2220398d0136d24724f63d7c403be991dfca1720..448d9826370618bdba84dc517c25a0bf57b4cb0c 100644 (file)
--- a/test/fixedbugs/bug357.go
+++ b/test/fixedbugs/bug357.go
@@ -15,8 +15,9 @@ func bla1() bool {
 
 func bla5() bool {
        _ = 1
-       false  // ERROR "false not used"
+       false  // ERROR "false not used|value computed is not used"
        _ = 2
+       return false
 }
 
 func main() {

diff --git a/test/fixedbugs/bug358.go b/test/fixedbugs/bug358.go
index cc622c047ffb17f4e3d4461de18ee9ba50757173..f43709b7e2567a4f84e58b00dbadb97351cddb9c 100644 (file)
--- a/test/fixedbugs/bug358.go
+++ b/test/fixedbugs/bug358.go
@@ -11,12 +11,12 @@ package main
 
 import (
        "http"
-       "io/ioutil"
+       "io/ioutil"     // GCCGO_ERROR "imported and not used"
        "os"
 )
 
 func makeHandler(fn func(http.ResponseWriter, *http.Request, string)) http.HandlerFunc {
-       return func(w http.ResponseWriter, r *http.Request)  // ERROR "syntax error"
+       return func(w http.ResponseWriter, r *http.Request)  // ERROR "syntax error|invalid use of type"
 }
 
 type Page struct {

diff --git a/test/fixedbugs/bug359.go b/test/fixedbugs/bug359.go
index 7f34672f1d9f12ce1ae7f3556de635432be90214..3701499ed20276d98e8f0add47b76c2ff0e33a2e 100644 (file)
--- a/test/fixedbugs/bug359.go
+++ b/test/fixedbugs/bug359.go
@@ -16,11 +16,11 @@ type Painting struct {
 }
 
 func (p Painting) Foo() {
-       for e := p.fragments; e.Front() != nil; {  // ERROR "unexported field"
+       for e := p.fragments; e.Front() != nil; {  // ERROR "unexported field|hidden field"
        }
 }
 
 // from comment 4 of issue 1910
 type Foo interface {
-       Run(a int) (a int)  // ERROR "a redeclared"
+       Run(a int) (a int)  // ERROR "a redeclared|redefinition|previous"
 }

diff --git a/test/fixedbugs/bug362.go b/test/fixedbugs/bug362.go
index 791209103015d183fd1579651cc14ce43ac44b13..f38572c0d0f6050ccc17b6ad21436ce3844a5951 100644 (file)
--- a/test/fixedbugs/bug362.go
+++ b/test/fixedbugs/bug362.go
@@ -10,7 +10,7 @@
 package main
 
 var (
-       a = iota  // ERROR "undefined: iota"
-       b = iota  // ERROR "undefined: iota"
-       c = iota  // ERROR "undefined: iota"
+       a = iota  // ERROR "undefined: iota|iota is only defined in const"
+       b = iota  // ERROR "undefined: iota|iota is only defined in const"
+       c = iota  // ERROR "undefined: iota|iota is only defined in const"
 )

diff --git a/test/fixedbugs/bug363.go b/test/fixedbugs/bug363.go
index 7e89749a0ab8613903e5133aef36d668eee045a2..7a9952642db659d4947e3134789a5eec0d74b46d 100644 (file)
--- a/test/fixedbugs/bug363.go
+++ b/test/fixedbugs/bug363.go
@@ -10,10 +10,10 @@ package main
 
 func main() {
        var i uint = 33
-       var a = (1<<i) + 4.5  // ERROR "shift of type float64"
+       var a = (1<<i) + 4.5  // ERROR "shift of type float64|shift of non-integer"
        println(a)
        
-       var b = (1<<i) + 4.0  // ERROR "shift of type float64"
+       var b = (1<<i) + 4.0  // ERROR "shift of type float64|shift of non-integer"
        println(b)
 
        var c int64 = (1<<i) + 4.0  // ok - it's all int64

diff --git a/test/fixedbugs/bug365.go b/test/fixedbugs/bug365.go
index 7ec19b0c8b7a7cd7837ea43dbe7753672bb7a07d..ce69505044089a61e9655a52ea19a468c936a527 100644 (file)
--- a/test/fixedbugs/bug365.go
+++ b/test/fixedbugs/bug365.go
@@ -12,7 +12,7 @@
 package main
 
 type S struct {
-       err os.Error  // ERROR "undefined"
+       err os.Error  // ERROR "undefined|expected package"
        Num int
 }