diff options
| author | Rob Pike <r@golang.org> | 2010-05-26 10:01:52 -0700 |
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2010-05-26 10:01:52 -0700 |
| commit | f93191fd3d9dea2910902b5515c2bdf3b3c30176 (patch) | |
| tree | 59fb240d0125bb6ed9b0b5e337b9bbf6446ae6a8 | |
| parent | cc151a7aa9eae222fdb3cac9953bc362cdff8a52 (diff) | |
| download | golang-f93191fd3d9dea2910902b5515c2bdf3b3c30176.tar.gz | |
fmt: fix 386 build. error strings differ for overflow on 386.
R=gri
CC=golang-dev
http://codereview.appspot.com/1316042
| -rw-r--r-- | src/pkg/fmt/scan_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pkg/fmt/scan_test.go b/src/pkg/fmt/scan_test.go index a49fb90a4..1c974e4d5 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) } } |
