Imported Upstream version 2012.01.27upstream-weekly/2012.01.27

1 files changed, 4 insertions, 7 deletions

diff --git a/test/zerodivide.go b/test/zerodivide.go
index 1948528d2..3b08e774c 100644
--- 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()
@@ -161,10 +158,10 @@ var errorTests = []ErrorTest{
 	ErrorTest{"complex128 1/0", func() { use(e128 / d128) }, ""},
 }
 
-func error(fn func()) (error string) {
+func error_(fn func()) (error string) {
 	defer func() {
 		if e := recover(); e != nil {
-			error = e.(Error).String()
+			error = e.(runtime.Error).Error()
 		}
 	}()
 	fn()
@@ -199,7 +196,7 @@ func main() {
 		if t.err != "" {
 			continue
 		}
-		err := error(t.fn)
+		err := error_(t.fn)
 		switch {
 		case t.err == "" && err == "":
 			// fine