diff options
| author | Ian Lance Taylor <iant@golang.org> | 2018-09-24 21:46:21 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-09-24 21:46:21 +0000 |
| commit | dd931d9b48647e898dc80927c532ae93cc09e192 (patch) | |
| tree | 71be2295cd79b8a182f6130611658db8628772d5 /libgo/go/net/dial_unix_test.go | |
| parent | 779d8a5ad09b01428726ea5a0e6c87bd9ac3c0e4 (diff) | |
libgo: update to Go 1.11
Reviewed-on: https://go-review.googlesource.com/136435
gotools/:
* Makefile.am (mostlyclean-local): Run chmod on check-go-dir to
make sure it is writable.
(check-go-tools): Likewise.
(check-vet): Copy internal/objabi to check-vet-dir.
* Makefile.in: Rebuild.
From-SVN: r264546
Diffstat (limited to 'libgo/go/net/dial_unix_test.go')
| -rw-r--r-- | libgo/go/net/dial_unix_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgo/go/net/dial_unix_test.go b/libgo/go/net/dial_unix_test.go index d5c6dde2818..3cfc9d81b8e 100644 --- a/libgo/go/net/dial_unix_test.go +++ b/libgo/go/net/dial_unix_test.go @@ -102,7 +102,8 @@ func TestDialContextCancelRace(t *testing.T) { if !ok || oe.Op != "dial" { t.Fatalf("Dial error = %#v; want dial *OpError", err) } - if oe.Err != ctx.Err() { - t.Errorf("DialContext = (%v, %v); want OpError with error %v", c, err, ctx.Err()) + + if oe.Err != errCanceled { + t.Errorf("DialContext = (%v, %v); want OpError with error %v", c, err, errCanceled) } } |