]> Cypherpunks repositories - gostls13.git/commitdiff
fmt: fix 386 build. error strings differ for overflow on 386.
authorRob Pike <r@golang.org>
Wed, 26 May 2010 17:01:52 +0000 (10:01 -0700)
committerRob Pike <r@golang.org>
Wed, 26 May 2010 17:01:52 +0000 (10:01 -0700)
R=gri
CC=golang-dev
https://golang.org/cl/1316042

src/pkg/fmt/scan_test.go

index a49fb90a48e93de8003bfa046809653ce3196453..1c974e4d5a2f4766d0c5411d98ca293924518420 100644 (file)
@@ -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)
                }
        }