diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-04 23:15:33 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-06-04 23:15:33 +0000 |
commit | 5892f89fbf9417381ac68163890704fe9e7d11f7 (patch) | |
tree | 89766166feb4ceca2d983169c5360e3f6f521b12 /libgo/go/net/net_test.go | |
parent | 40196b7832598b0a0298d7a8bc5b8a4c723c80aa (diff) | |
download | gcc-5892f89fbf9417381ac68163890704fe9e7d11f7.tar.gz |
libgo: Merge from revision 18783:00cce3a34d7e of master library.
This revision was committed January 7, 2014. The next
revision deleted runtime/mfinal.c. That will be done in a
subsequent merge.
This merge changes type descriptors to add a zero field,
pointing to a zero value for that type. This is implemented
as a common variable.
* go-gcc.cc (Gcc_backend::implicit_variable): Add is_common and
alignment parameters. Permit init parameter to be NULL.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211249 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/net/net_test.go')
-rw-r--r-- | libgo/go/net/net_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libgo/go/net/net_test.go b/libgo/go/net/net_test.go index 1320096df8f..c9fb433ec91 100644 --- a/libgo/go/net/net_test.go +++ b/libgo/go/net/net_test.go @@ -231,12 +231,12 @@ func TestErrorNil(t *testing.T) { // Make Listen fail by relistening on the same address. l, err := Listen("tcp", "127.0.0.1:0") if err != nil { - t.Fatal("Listen 127.0.0.1:0: %v", err) + t.Fatalf("Listen 127.0.0.1:0: %v", err) } defer l.Close() l1, err := Listen("tcp", l.Addr().String()) if err == nil { - t.Fatal("second Listen %v: %v", l.Addr(), err) + t.Fatalf("second Listen %v: %v", l.Addr(), err) } if l1 != nil { t.Fatalf("Listen returned non-nil interface %T(%v) with err != nil", l1, l1) @@ -245,12 +245,12 @@ func TestErrorNil(t *testing.T) { // Make ListenPacket fail by relistening on the same address. lp, err := ListenPacket("udp", "127.0.0.1:0") if err != nil { - t.Fatal("Listen 127.0.0.1:0: %v", err) + t.Fatalf("Listen 127.0.0.1:0: %v", err) } defer lp.Close() lp1, err := ListenPacket("udp", lp.LocalAddr().String()) if err == nil { - t.Fatal("second Listen %v: %v", lp.LocalAddr(), err) + t.Fatalf("second Listen %v: %v", lp.LocalAddr(), err) } if lp1 != nil { t.Fatalf("ListenPacket returned non-nil interface %T(%v) with err != nil", lp1, lp1) |