diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/net/listen_test.go | 3 | ||||
| -rw-r--r-- | libgo/go/net/mockserver_test.go | 2 | ||||
| -rw-r--r-- | libgo/go/net/splice_test.go | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 0a70b3a..a1cd924 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -4fbd06dc7b1b8fb665293399a2b6d5326435512f +45a2e231958854fd945961f0335ac0805d502510 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/net/listen_test.go b/libgo/go/net/listen_test.go index 6c3f70c..6c9b92a 100644 --- a/libgo/go/net/listen_test.go +++ b/libgo/go/net/listen_test.go @@ -780,6 +780,9 @@ func TestListenConfigControl(t *testing.T) { continue } c.Close() + if network == "unixgram" { + os.Remove(address) + } } }) } diff --git a/libgo/go/net/mockserver_test.go b/libgo/go/net/mockserver_test.go index 5302935..e085f44 100644 --- a/libgo/go/net/mockserver_test.go +++ b/libgo/go/net/mockserver_test.go @@ -17,8 +17,6 @@ import ( ) // testUnixAddr uses ioutil.TempFile to get a name that is unique. -// It also uses /tmp directory in case it is prohibited to create UNIX -// sockets in TMPDIR. func testUnixAddr() string { f, err := ioutil.TempFile("", "go-nettest") if err != nil { diff --git a/libgo/go/net/splice_test.go b/libgo/go/net/splice_test.go index 26e3ac4..324103e 100644 --- a/libgo/go/net/splice_test.go +++ b/libgo/go/net/splice_test.go @@ -242,6 +242,7 @@ func testSpliceNoUnixgram(t *testing.T) { if err != nil { t.Fatal(err) } + defer os.Remove(addr.Name) up, err := ListenUnixgram("unixgram", addr) if err != nil { t.Fatal(err) |