aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2010-05-26 10:01:52 -0700
committerRob Pike <r@golang.org>2010-05-26 10:01:52 -0700
commit5b779284783fffdc1f573811b2b792fd83dea347 (patch)
treea1806617d3e01cc86c3a085f9a8c41e4f6c01799
parent71f130f55cd2df82747fb4d3232c7a080fdc7b16 (diff)
downloadgo-5b779284783fffdc1f573811b2b792fd83dea347.tar.gz
go-5b779284783fffdc1f573811b2b792fd83dea347.zip
fmt: fix 386 build. error strings differ for overflow on 386.
R=gri CC=golang-dev https://golang.org/cl/1316042
-rw-r--r--src/pkg/fmt/scan_test.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pkg/fmt/scan_test.go b/src/pkg/fmt/scan_test.go
index a49fb90a48..1c974e4d5a 100644
--- a/src/pkg/fmt/scan_test.go
+++ b/src/pkg/fmt/scan_test.go
@@ -121,6 +121,8 @@ func TestScanln(t *testing.T) {
}
func TestScanOverflow(t *testing.T) {
+ // different machines and different types report errors with different strings.
+ re := testing.MustCompile("overflow|too large|out of range|not representable")
for _, test := range overflowTests {
r := strings.NewReader(test.text)
_, err := Scan(r, test.in)
@@ -128,7 +130,7 @@ func TestScanOverflow(t *testing.T) {
t.Errorf("expected overflow scanning %q", test.text)
continue
}
- if strings.Index(err.String(), "overflow") < 0 && strings.Index(err.String(), "too large") < 0 {
+ if !re.MatchString(err.String()) {
t.Errorf("expected overflow error scanning %q: %s", test.text, err)
}
}