net: support forceCgoDNS and forceGoDns on windows

Windows is able to use the go resolver now, so let the forceCgoDNS and forceGoDns work.

Change-Id: Ice3d9fda9530ec88a2a22077c9a729dd940aba6d
GitHub-Last-Rev: e0b6e39870b147e6a1b4db920fd39920fe9c2bfc
GitHub-Pull-Request: golang/go#59250
Reviewed-on: https://go-review.googlesource.com/c/go/+/479455
Run-TryBot: Ian Lance Taylor <iant@google.com>
Auto-Submit: Ian Lance Taylor <iant@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Damien Neil <dneil@google.com>

diff --git a/src/net/main_conf_test.go b/src/net/main_conf_test.go
index 41b78eda1d8219f58388e58512fe5e757450e1b8..71257976bdebfa962c1ae67e3f2d8fa3ca36658f 100644 (file)
--- a/src/net/main_conf_test.go
+++ b/src/net/main_conf_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !js && !plan9 && !windows
+//go:build !js && !plan9
 
 package net
 

diff --git a/src/net/main_noconf_test.go b/src/net/main_noconf_test.go
index ab050fac2b4ec04aad5b38be65d88a96fa1b1fb0..d7f22664b542379acc1d155213f396cd391ab30e 100644 (file)
--- a/src/net/main_noconf_test.go
+++ b/src/net/main_noconf_test.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build (js && wasm) || plan9 || windows
+//go:build (js && wasm) || plan9
 
 package net
 
@@ -11,7 +11,7 @@ import "runtime"
 // See main_conf_test.go for what these (don't) do.
 func forceGoDNS() func() {
        switch runtime.GOOS {
-       case "plan9", "windows":
+       case "plan9":
                return func() {}
        default:
                return nil