test: error-related fixes

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5328051

diff --git a/test/fixedbugs/bug365.go b/test/fixedbugs/bug365.go
index ce69505044089a61e9655a52ea19a468c936a527..bc8c2c5e62c7d9a07b2d472f9064575b95a23494 100644 (file)
--- a/test/fixedbugs/bug365.go
+++ b/test/fixedbugs/bug365.go
@@ -12,11 +12,11 @@
 package main
 
 type S struct {
-       err os.Error  // ERROR "undefined|expected package"
+       err foo.Bar // ERROR "undefined|expected package"
        Num int
 }
 
 func main() {
        s := S{}
-       _ = s.Num  // no error here please
+       _ = s.Num // no error here please
 }

diff --git a/test/import.go b/test/import.go
index 96330340dfc22110061879fb32b83b455b1bf12d..bd83dc3bdd30c4d52f10e52c79b926b07cdfda2d 100644 (file)
--- a/test/import.go
+++ b/test/import.go
@@ -13,13 +13,12 @@ import _os_ "os"
 import "os"
 import . "os"
 
-func f(e os.Error)
+func f(e *os.File)
 
 func main() {
-       var _e_ _os_.Error
-       var dot Error
+       var _e_ *_os_.File
+       var dot *File
 
        f(_e_)
        f(dot)
 }
-

diff --git a/test/zerodivide.go b/test/zerodivide.go
index 1948528d2450a36278ab128095ca13f4d407de48..3a1ff150510c4af116d2fc3e7ed9cfe94bac89fc 100644 (file)
--- a/test/zerodivide.go
+++ b/test/zerodivide.go
@@ -9,13 +9,10 @@ package main
 import (
        "fmt"
        "math"
+       "runtime"
        "strings"
 )
 
-type Error interface {
-       String() string
-}
-
 type ErrorTest struct {
        name string
        fn   func()
@@ -164,7 +161,7 @@ var errorTests = []ErrorTest{
 func error(fn func()) (error string) {
        defer func() {
                if e := recover(); e != nil {
-                       error = e.(Error).String()
+                       error = e.(runtime.Error).String()
                }
        }()
        fn()