net: remove the dreg of solaris merge

Also enables netgo test on solaris.

LGTM=aram, jsing
R=golang-codereviews, dave, aram, jsing
CC=golang-codereviews
https://golang.org/cl/70300043

diff --git a/src/pkg/net/cgo_unix.go b/src/pkg/net/cgo_unix.go
index 0c670982f21a80fa8b740b424f0e1a5fc58b7cac..1f366ee5c6d1596dee3d623b2b8d0969ea8e4ff6 100644 (file)
--- a/src/pkg/net/cgo_unix.go
+++ b/src/pkg/net/cgo_unix.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build !netgo
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package net
 

diff --git a/src/pkg/net/netgo_unix_test.go b/src/pkg/net/netgo_unix_test.go
index dce9ff9575bedf1362ce4cc4033c028510edcb02..9fb2a567df99a6efe8261e8a40bec3d70a295d54 100644 (file)
--- a/src/pkg/net/netgo_unix_test.go
+++ b/src/pkg/net/netgo_unix_test.go
@@ -3,7 +3,7 @@
 // license that can be found in the LICENSE file.
 
 // +build !cgo netgo
-// +build darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package net