1
0
mirror of https://github.com/golang/go synced 2024-11-13 13:00:32 -07:00

test: error-related fixes

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5328051
This commit is contained in:
Russ Cox 2011-10-27 19:41:39 -07:00
parent 29fb5d3e0f
commit 64f78c918a
3 changed files with 7 additions and 11 deletions

View File

@ -12,11 +12,11 @@
package main package main
type S struct { type S struct {
err os.Error // ERROR "undefined|expected package" err foo.Bar // ERROR "undefined|expected package"
Num int Num int
} }
func main() { func main() {
s := S{} s := S{}
_ = s.Num // no error here please _ = s.Num // no error here please
} }

View File

@ -13,13 +13,12 @@ import _os_ "os"
import "os" import "os"
import . "os" import . "os"
func f(e os.Error) func f(e *os.File)
func main() { func main() {
var _e_ _os_.Error var _e_ *_os_.File
var dot Error var dot *File
f(_e_) f(_e_)
f(dot) f(dot)
} }

View File

@ -9,13 +9,10 @@ package main
import ( import (
"fmt" "fmt"
"math" "math"
"runtime"
"strings" "strings"
) )
type Error interface {
String() string
}
type ErrorTest struct { type ErrorTest struct {
name string name string
fn func() fn func()
@ -164,7 +161,7 @@ var errorTests = []ErrorTest{
func error(fn func()) (error string) { func error(fn func()) (error string) {
defer func() { defer func() {
if e := recover(); e != nil { if e := recover(); e != nil {
error = e.(Error).String() error = e.(runtime.Error).String()
} }
}() }()
fn() fn()