From 33c06ee12a53e293f4a787c1dfde7eb7ddb0be63 Mon Sep 17 00:00:00 2001 From: "Bryan C. Mills" Date: Fri, 3 Mar 2023 14:48:10 +0000 Subject: [PATCH] cmd/go: declare net hosts in script tests Although we aren't precise about enforcing the hosts just yet, we can eventually use the declared hostnames to selectively skip tests (for example, if an external service has an outage while a Go release is being tested). Also relax the constraint to [short] in tests that require only vcs-test.golang.org, which has redirected to an in-process server since around CL 427914. Also enforce that tests that use the network actually use the [net] constraint, by setting TESTGONETWORK=panic in the test environment until the condition is evaluated. For #52545. For #54503. Updates #27494. Change-Id: I13be6b42a9beee97657eb45424882e787ac164c3 Reviewed-on: https://go-review.googlesource.com/c/go/+/473276 Run-TryBot: Bryan Mills TryBot-Bypass: Bryan Mills Reviewed-by: Russ Cox Auto-Submit: Bryan Mills --- src/cmd/go/internal/web/http.go | 2 +- src/cmd/go/script_test.go | 8 ++++++-- src/cmd/go/scriptconds_test.go | 18 ++++++++++++++++-- src/cmd/go/testdata/script/README | 4 ++-- src/cmd/go/testdata/script/get_404_meta.txt | 2 +- .../script/get_custom_domain_wildcard.txt | 2 +- src/cmd/go/testdata/script/get_dash_t.txt | 2 +- src/cmd/go/testdata/script/get_domain_root.txt | 2 +- .../testdata/script/get_dot_slash_download.txt | 2 +- src/cmd/go/testdata/script/get_goroot.txt | 2 +- src/cmd/go/testdata/script/get_insecure.txt | 2 +- .../script/get_insecure_custom_domain.txt | 2 +- .../go/testdata/script/get_insecure_env.txt | 2 +- .../testdata/script/get_insecure_redirect.txt | 1 - .../go/testdata/script/get_insecure_update.txt | 2 +- .../testdata/script/get_internal_wildcard.txt | 2 +- src/cmd/go/testdata/script/get_issue11307.txt | 2 +- src/cmd/go/testdata/script/get_issue16471.txt | 3 ++- src/cmd/go/testdata/script/get_issue22125.txt | 2 +- src/cmd/go/testdata/script/get_non_pkg.txt | 4 ++-- src/cmd/go/testdata/script/get_race.txt | 2 +- src/cmd/go/testdata/script/get_test_only.txt | 2 +- src/cmd/go/testdata/script/get_tilde.txt | 15 ++++++++------- src/cmd/go/testdata/script/get_update.txt | 2 +- src/cmd/go/testdata/script/get_update_all.txt | 2 -- .../script/get_update_unknown_protocol.txt | 2 +- .../go/testdata/script/get_update_wildcard.txt | 2 +- src/cmd/go/testdata/script/get_vendor.txt | 2 +- .../go/testdata/script/get_with_git_trace.txt | 2 +- .../go/testdata/script/gopath_moved_repo.txt | 2 +- .../testdata/script/gopath_vendor_dup_err.txt | 1 - src/cmd/go/testdata/script/govcs.txt | 8 ++++---- .../testdata/script/install_shadow_gopath.txt | 2 -- src/cmd/go/testdata/script/list_std_vendor.txt | 2 +- src/cmd/go/testdata/script/mod_auth.txt | 2 +- src/cmd/go/testdata/script/mod_convert.txt | 8 ++++++-- .../script/mod_convert_tsv_insecure.txt | 2 +- .../script/mod_download_git_decorate_full.txt | 4 ++-- .../go/testdata/script/mod_download_hash.txt | 2 +- .../script/mod_download_insecure_redirect.txt | 2 +- .../script/mod_download_issue51114.txt | 3 +-- .../script/mod_download_private_vcs.txt | 2 +- .../go/testdata/script/mod_download_svn.txt | 2 +- src/cmd/go/testdata/script/mod_get_direct.txt | 3 +-- .../go/testdata/script/mod_get_fallback.txt | 3 ++- src/cmd/go/testdata/script/mod_get_fossil.txt | 2 +- src/cmd/go/testdata/script/mod_get_hash.txt | 2 +- src/cmd/go/testdata/script/mod_get_major.txt | 2 +- src/cmd/go/testdata/script/mod_get_pseudo.txt | 2 +- .../script/mod_get_pseudo_other_branch.txt | 2 +- .../testdata/script/mod_get_pseudo_prefix.txt | 2 +- src/cmd/go/testdata/script/mod_getx.txt | 3 +-- .../testdata/script/mod_git_export_subst.txt | 2 +- src/cmd/go/testdata/script/mod_gonoproxy.txt | 3 ++- .../go/testdata/script/mod_gopkg_unstable.txt | 2 +- src/cmd/go/testdata/script/mod_init_glide.txt | 2 +- .../go/testdata/script/mod_invalid_version.txt | 4 +++- src/cmd/go/testdata/script/mod_list_direct.txt | 2 +- .../go/testdata/script/mod_list_odd_tags.txt | 1 - .../go/testdata/script/mod_missing_repo.txt | 2 +- .../testdata/script/mod_prefer_compatible.txt | 3 ++- .../go/testdata/script/mod_proxy_errors.txt | 2 +- src/cmd/go/testdata/script/mod_proxy_https.txt | 2 +- .../go/testdata/script/mod_pseudo_cache.txt | 2 +- .../go/testdata/script/mod_replace_gopkgin.txt | 3 +-- .../script/mod_retract_pseudo_base.txt | 2 +- .../go/testdata/script/mod_sumdb_file_path.txt | 2 +- .../go/testdata/script/mod_sumdb_golang.txt | 3 ++- src/cmd/go/testdata/script/mod_vcs_missing.txt | 2 +- src/cmd/go/testdata/script/reuse_git.txt | 1 - .../testdata/script/vendor_list_issue11977.txt | 2 +- .../testdata/script/vendor_test_issue11864.txt | 2 +- .../testdata/script/vendor_test_issue14613.txt | 2 +- 73 files changed, 112 insertions(+), 94 deletions(-) diff --git a/src/cmd/go/internal/web/http.go b/src/cmd/go/internal/web/http.go index cd3e39afe0a1a..e7935ea184277 100644 --- a/src/cmd/go/internal/web/http.go +++ b/src/cmd/go/internal/web/http.go @@ -114,7 +114,7 @@ func interceptURL(u *urlpkg.URL) (*Interceptor, bool) { return nil, false } for i, t := range testInterceptors { - if u.Host == t.FromHost && (t.Scheme == "" || u.Scheme == t.Scheme) { + if u.Host == t.FromHost && (u.Scheme == "" || u.Scheme == t.Scheme) { return &testInterceptors[i], true } } diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go index 4211fb6121c67..072a2dfef547f 100644 --- a/src/cmd/go/script_test.go +++ b/src/cmd/go/script_test.go @@ -210,6 +210,7 @@ func scriptEnv(srv *vcstest.Server, srvCertFile string) ([]string, error) { "GOROOT=" + testGOROOT, "GOROOT_FINAL=" + testGOROOT_FINAL, // causes spurious rebuilds and breaks the "stale" built-in if not propagated "GOTRACEBACK=system", + "TESTGONETWORK=panic", // allow only local connections by default; the [net] condition resets this "TESTGO_GOROOT=" + testGOROOT, "TESTGO_EXE=" + testGo, "TESTGO_VCSTEST_HOST=" + httpURL.Host, @@ -232,8 +233,11 @@ func scriptEnv(srv *vcstest.Server, srvCertFile string) ([]string, error) { "GIT_TRACE_CURL_NO_DATA=1", "GIT_REDACT_COOKIES=o,SSO,GSSO_Uberproxy") } - if !testenv.HasExternalNetwork() { - env = append(env, "TESTGONETWORK=panic", "TESTGOVCS=panic") + if testing.Short() { + // VCS commands are always somewhat slow: they either require access to external hosts, + // or they require our intercepted vcs-test.golang.org to regenerate the repository. + // Require all tests that use VCS commands to be skipped in short mode. + env = append(env, "TESTGOVCS=panic") } if os.Getenv("CGO_ENABLED") != "" || runtime.GOOS != goHostOS || runtime.GOARCH != goHostArch { // If the actual CGO_ENABLED might not match the cmd/go default, set it diff --git a/src/cmd/go/scriptconds_test.go b/src/cmd/go/scriptconds_test.go index c57d55a3d1721..a9b5f9acec404 100644 --- a/src/cmd/go/scriptconds_test.go +++ b/src/cmd/go/scriptconds_test.go @@ -40,6 +40,7 @@ func scriptConditions() map[string]script.Cond { add("buildmode", script.PrefixCondition("go supports -buildmode=", hasBuildmode)) add("case-sensitive", script.OnceCondition("$WORK filesystem is case-sensitive", isCaseSensitive)) add("cgo", script.BoolCondition("host CGO_ENABLED", testenv.HasCGO())) + add("cgolinkext", script.BoolCondition("platform requires external linking for cgo", platform.MustLinkExternal(cfg.Goos, cfg.Goarch, true))) add("cross", script.BoolCondition("cmd/go GOOS/GOARCH != GOHOSTOS/GOHOSTARCH", goHostOS != runtime.GOOS || goHostArch != runtime.GOARCH)) add("fuzz", sysCondition("-fuzz", platform.FuzzSupported, false)) add("fuzz-instrumented", sysCondition("-fuzz with instrumentation", platform.FuzzInstrumented, false)) @@ -49,8 +50,7 @@ func scriptConditions() map[string]script.Cond { add("link", lazyBool("testenv.HasLink()", testenv.HasLink)) add("mismatched-goroot", script.Condition("test's GOROOT_FINAL does not match the real GOROOT", isMismatchedGoroot)) add("msan", sysCondition("-msan", platform.MSanSupported, true)) - add("cgolinkext", script.BoolCondition("platform requires external linking for cgo", platform.MustLinkExternal(cfg.Goos, cfg.Goarch, true))) - add("net", lazyBool("testenv.HasExternalNetwork()", testenv.HasExternalNetwork)) + add("net", script.PrefixCondition("can connect to external network host ", hasNet)) add("race", sysCondition("-race", platform.RaceDetectorSupported, true)) add("symlink", lazyBool("testenv.HasSymlink()", testenv.HasSymlink)) add("trimpath", script.OnceCondition("test binary was built with -trimpath", isTrimpath)) @@ -95,6 +95,20 @@ func hasBuildmode(s *script.State, mode string) (bool, error) { return platform.BuildModeSupported(runtime.Compiler, mode, GOOS, GOARCH), nil } +func hasNet(s *script.State, host string) (bool, error) { + if !testenv.HasExternalNetwork() { + return false, nil + } + + // TODO(bcmills): Add a flag or environment variable to allow skipping tests + // for specific hosts and/or skipping all net tests except for specific hosts. + + // Since we have confirmed that the network is available, + // allow cmd/go to use it. + s.Setenv("TESTGONETWORK", "") + return true, nil +} + func hasGodebug(s *script.State, value string) (bool, error) { godebug, _ := s.LookupEnv("GODEBUG") for _, p := range strings.Split(godebug, ",") { diff --git a/src/cmd/go/testdata/script/README b/src/cmd/go/testdata/script/README index 349ba972fb692..c653764145efe 100644 --- a/src/cmd/go/testdata/script/README +++ b/src/cmd/go/testdata/script/README @@ -402,8 +402,8 @@ The available conditions are: test's GOROOT_FINAL does not match the real GOROOT [msan] GOOS/GOARCH supports -msan -[net] - testenv.HasExternalNetwork() +[net:*] + can connect to external network host [race] GOOS/GOARCH supports -race [root] diff --git a/src/cmd/go/testdata/script/get_404_meta.txt b/src/cmd/go/testdata/script/get_404_meta.txt index 553afb9ae105c..4ffbdebd8608c 100644 --- a/src/cmd/go/testdata/script/get_404_meta.txt +++ b/src/cmd/go/testdata/script/get_404_meta.txt @@ -1,6 +1,6 @@ # golang.org/issue/13037: 'go get' was not parsing tags in 404 served over HTTPS. -[!net] skip +[!net:bazil.org] skip [!git] skip env GONOSUMDB=bazil.org,github.com,golang.org diff --git a/src/cmd/go/testdata/script/get_custom_domain_wildcard.txt b/src/cmd/go/testdata/script/get_custom_domain_wildcard.txt index 32ddd92b59882..45ab5243c2b36 100644 --- a/src/cmd/go/testdata/script/get_custom_domain_wildcard.txt +++ b/src/cmd/go/testdata/script/get_custom_domain_wildcard.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:rsc.io] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_dash_t.txt b/src/cmd/go/testdata/script/get_dash_t.txt index 66d217a869fa0..8f3a03646b557 100644 --- a/src/cmd/go/testdata/script/get_dash_t.txt +++ b/src/cmd/go/testdata/script/get_dash_t.txt @@ -1,6 +1,6 @@ # Tests issue 8181 -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_domain_root.txt b/src/cmd/go/testdata/script/get_domain_root.txt index 250fa6464f518..dfcea865b9f58 100644 --- a/src/cmd/go/testdata/script/get_domain_root.txt +++ b/src/cmd/go/testdata/script/get_domain_root.txt @@ -1,7 +1,7 @@ # Tests issue #9357 # go get foo.io (not foo.io/subdir) was not working consistently. -[!net] skip +[!net:go-get-issue-9357.appspot.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_dot_slash_download.txt b/src/cmd/go/testdata/script/get_dot_slash_download.txt index 2af9564fe42e3..6dbd1184cc733 100644 --- a/src/cmd/go/testdata/script/get_dot_slash_download.txt +++ b/src/cmd/go/testdata/script/get_dot_slash_download.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:rsc.io] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_goroot.txt b/src/cmd/go/testdata/script/get_goroot.txt index dc1e5adccf1f9..751069221f399 100644 --- a/src/cmd/go/testdata/script/get_goroot.txt +++ b/src/cmd/go/testdata/script/get_goroot.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:github.com] skip env GO111MODULE=off # Issue 4186. go get cannot be used to download packages to $GOROOT. diff --git a/src/cmd/go/testdata/script/get_insecure.txt b/src/cmd/go/testdata/script/get_insecure.txt index 0079220e40816..afe64b8c2667f 100644 --- a/src/cmd/go/testdata/script/get_insecure.txt +++ b/src/cmd/go/testdata/script/get_insecure.txt @@ -1,6 +1,6 @@ # TODO(matloob): Split this test into two? It's one of the slowest tests we have. -[!net] skip +[!net:insecure.go-get-issue-15410.appspot.com] skip [!git] skip env PATH=$WORK/tmp/bin${:}$PATH diff --git a/src/cmd/go/testdata/script/get_insecure_custom_domain.txt b/src/cmd/go/testdata/script/get_insecure_custom_domain.txt index 3a0765f2a1ed6..4b3c9d66eae2b 100644 --- a/src/cmd/go/testdata/script/get_insecure_custom_domain.txt +++ b/src/cmd/go/testdata/script/get_insecure_custom_domain.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:insecure.go-get-issue-15410.appspot.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_insecure_env.txt b/src/cmd/go/testdata/script/get_insecure_env.txt index 87484404eb67a..98e705384ae02 100644 --- a/src/cmd/go/testdata/script/get_insecure_env.txt +++ b/src/cmd/go/testdata/script/get_insecure_env.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:insecure.go-get-issue-15410.appspot.com] skip [!git] skip # GOPATH: Set up diff --git a/src/cmd/go/testdata/script/get_insecure_redirect.txt b/src/cmd/go/testdata/script/get_insecure_redirect.txt index 2e5ec4e0d8c6d..2a37902215bf3 100644 --- a/src/cmd/go/testdata/script/get_insecure_redirect.txt +++ b/src/cmd/go/testdata/script/get_insecure_redirect.txt @@ -1,7 +1,6 @@ # golang.org/issue/29591: 'go get' was following plain-HTTP redirects even without -insecure (now replaced by GOINSECURE). # golang.org/issue/34049: 'go get' would panic in case of an insecure redirect in GOPATH mode -[!net] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_insecure_update.txt b/src/cmd/go/testdata/script/get_insecure_update.txt index 01660d58b4b17..7cddd6ba8e64a 100644 --- a/src/cmd/go/testdata/script/get_insecure_update.txt +++ b/src/cmd/go/testdata/script/get_insecure_update.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_internal_wildcard.txt b/src/cmd/go/testdata/script/get_internal_wildcard.txt index 71ecb8c8fe160..b25e746ba60a7 100644 --- a/src/cmd/go/testdata/script/get_internal_wildcard.txt +++ b/src/cmd/go/testdata/script/get_internal_wildcard.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_issue11307.txt b/src/cmd/go/testdata/script/get_issue11307.txt index dc46e747123b3..d490959438c0d 100644 --- a/src/cmd/go/testdata/script/get_issue11307.txt +++ b/src/cmd/go/testdata/script/get_issue11307.txt @@ -1,6 +1,6 @@ # go get -u was not working except in checkout directory -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_issue16471.txt b/src/cmd/go/testdata/script/get_issue16471.txt index 60369132f95a6..1aeae584a9d7d 100644 --- a/src/cmd/go/testdata/script/get_issue16471.txt +++ b/src/cmd/go/testdata/script/get_issue16471.txt @@ -1,4 +1,5 @@ -[!net] skip +[!net:rsc.io] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_issue22125.txt b/src/cmd/go/testdata/script/get_issue22125.txt index 3418df8429576..086081f60d6c1 100644 --- a/src/cmd/go/testdata/script/get_issue22125.txt +++ b/src/cmd/go/testdata/script/get_issue22125.txt @@ -1,6 +1,6 @@ # This test verifies a fix for a security issue; see https://go.dev/issue/22125. -[!net] skip +[short] skip [!git] skip [!exec:svn] skip diff --git a/src/cmd/go/testdata/script/get_non_pkg.txt b/src/cmd/go/testdata/script/get_non_pkg.txt index 5eac1e337ee6d..5202e88a254dc 100644 --- a/src/cmd/go/testdata/script/get_non_pkg.txt +++ b/src/cmd/go/testdata/script/get_non_pkg.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:golang.org] skip [!git] skip env GOBIN=$WORK/tmp/gobin @@ -11,4 +11,4 @@ stderr 'golang.org/x/tools: no Go files' stderr 'golang.org/x/tools: no Go files' ! go get -d golang.org/x/tools -stderr 'golang.org/x/tools: no Go files' \ No newline at end of file +stderr 'golang.org/x/tools: no Go files' diff --git a/src/cmd/go/testdata/script/get_race.txt b/src/cmd/go/testdata/script/get_race.txt index 87fbf62863b03..1e06c80805b3f 100644 --- a/src/cmd/go/testdata/script/get_race.txt +++ b/src/cmd/go/testdata/script/get_race.txt @@ -1,6 +1,6 @@ # Tests issue #20502 -[!net] skip +[!net:github.com] skip [!git] skip [!race] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_test_only.txt b/src/cmd/go/testdata/script/get_test_only.txt index ec8baf9553f9a..af90f74b6fba0 100644 --- a/src/cmd/go/testdata/script/get_test_only.txt +++ b/src/cmd/go/testdata/script/get_test_only.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:golang.org] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_tilde.txt b/src/cmd/go/testdata/script/get_tilde.txt index e520957359ca1..1c3a02965e7d7 100644 --- a/src/cmd/go/testdata/script/get_tilde.txt +++ b/src/cmd/go/testdata/script/get_tilde.txt @@ -1,24 +1,25 @@ env GO111MODULE=off -[short] skip # Paths containing windows short names should be rejected before attempting to fetch. -! go get example.com/longna~1.dir/thing +! go get vcs-test.golang.org/longna~1.dir/thing stderr 'trailing tilde and digits' -! go get example.com/longna~1/thing +! go get vcs-test.golang.org/longna~1/thing stderr 'trailing tilde and digits' -! go get example.com/~9999999/thing +! go get vcs-test.golang.org/~9999999/thing stderr 'trailing tilde and digits' +[short] stop + # A path containing an element that is just a tilde, or a tilde followed by non-digits, # should attempt to resolve. -! go get example.com/~glenda/notfound +! go get vcs-test.golang.org/~glenda/notfound ! stderr 'trailing tilde and digits' stderr 'unrecognized import path' -! go get example.com/~glenda2/notfound +! go get vcs-test.golang.org/~glenda2/notfound ! stderr 'trailing tilde and digits' stderr 'unrecognized import path' -! go get example.com/~/notfound +! go get vcs-test.golang.org/~/notfound ! stderr 'trailing tilde and digits' stderr 'unrecognized import path' diff --git a/src/cmd/go/testdata/script/get_update.txt b/src/cmd/go/testdata/script/get_update.txt index 5aeb99000b203..a70a80d2d6bab 100644 --- a/src/cmd/go/testdata/script/get_update.txt +++ b/src/cmd/go/testdata/script/get_update.txt @@ -2,7 +2,7 @@ # The recursive updating was trying to walk to # former dependencies, not current ones. -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_update_all.txt b/src/cmd/go/testdata/script/get_update_all.txt index 2b7584920956e..22fe3edaf1edb 100644 --- a/src/cmd/go/testdata/script/get_update_all.txt +++ b/src/cmd/go/testdata/script/get_update_all.txt @@ -1,8 +1,6 @@ # Issue 14444: go get -u .../ duplicate loads errors # Check that go get update -u ... does not try to load duplicates -[!net] skip - env GO111MODULE=off go get -u -n .../ diff --git a/src/cmd/go/testdata/script/get_update_unknown_protocol.txt b/src/cmd/go/testdata/script/get_update_unknown_protocol.txt index 12807ad675f7d..714ed6a9ca031 100644 --- a/src/cmd/go/testdata/script/get_update_unknown_protocol.txt +++ b/src/cmd/go/testdata/script/get_update_unknown_protocol.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_update_wildcard.txt b/src/cmd/go/testdata/script/get_update_wildcard.txt index 01e2c374aefea..c83378311439f 100644 --- a/src/cmd/go/testdata/script/get_update_wildcard.txt +++ b/src/cmd/go/testdata/script/get_update_wildcard.txt @@ -1,6 +1,6 @@ # Issue 14450: go get -u .../ tried to import not downloaded package -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/get_vendor.txt b/src/cmd/go/testdata/script/get_vendor.txt index f9a4a6bf7bff1..179456d9f38ed 100644 --- a/src/cmd/go/testdata/script/get_vendor.txt +++ b/src/cmd/go/testdata/script/get_vendor.txt @@ -11,7 +11,7 @@ stdout 'v/vendor/vendor.org/p' go get -d go get -t -d -[!net] stop +[!net:github.com] stop [!git] stop cd $GOPATH/src diff --git a/src/cmd/go/testdata/script/get_with_git_trace.txt b/src/cmd/go/testdata/script/get_with_git_trace.txt index abc7014e45749..6f1305a83baf2 100644 --- a/src/cmd/go/testdata/script/get_with_git_trace.txt +++ b/src/cmd/go/testdata/script/get_with_git_trace.txt @@ -2,7 +2,7 @@ env GO111MODULE=off env GIT_TRACE=1 -[!net] skip +[!net:golang.org] skip [!git] skip # go get should be success when GIT_TRACE set diff --git a/src/cmd/go/testdata/script/gopath_moved_repo.txt b/src/cmd/go/testdata/script/gopath_moved_repo.txt index 5815d73a4aeaf..8108d9bb6de1e 100644 --- a/src/cmd/go/testdata/script/gopath_moved_repo.txt +++ b/src/cmd/go/testdata/script/gopath_moved_repo.txt @@ -3,7 +3,7 @@ env GO111MODULE=off # Test that 'go get -u' reports packages whose VCS configurations do not # match their import paths. -[!net] skip +[!net:rsc.io] skip [short] skip # We need to execute a custom Go program to break the config files. diff --git a/src/cmd/go/testdata/script/gopath_vendor_dup_err.txt b/src/cmd/go/testdata/script/gopath_vendor_dup_err.txt index 22e6048e96b95..5f1e09a88b90e 100644 --- a/src/cmd/go/testdata/script/gopath_vendor_dup_err.txt +++ b/src/cmd/go/testdata/script/gopath_vendor_dup_err.txt @@ -1,4 +1,3 @@ -[!net] skip env GO111MODULE=off # Issue 17119: Test more duplicate load errors. diff --git a/src/cmd/go/testdata/script/govcs.txt b/src/cmd/go/testdata/script/govcs.txt index 419a6c5d20dd4..dd128cca2f85c 100644 --- a/src/cmd/go/testdata/script/govcs.txt +++ b/src/cmd/go/testdata/script/govcs.txt @@ -67,12 +67,12 @@ stderr '^go: rsc.io/nonexist.bzr/hello: GOVCS disallows using bzr for public rsc # git is OK by default env GOVCS= env GONOSUMDB='*' -[net] [git] [!short] go get rsc.io/sampler +[net:rsc.io] [git] [!short] go get rsc.io/sampler # hg is OK by default env GOVCS= env GONOSUMDB='*' -[net] [exec:hg] [!short] go get vcs-test.golang.org/go/custom-hg-hello +[exec:hg] [!short] go get vcs-test.golang.org/go/custom-hg-hello # git can be disallowed env GOVCS=public:hg @@ -150,12 +150,12 @@ stderr '^package rsc.io/nonexist.bzr/hello: GOVCS disallows using bzr for public # git is OK by default env GOVCS= env GONOSUMDB='*' -[net] [git] [!short] go get rsc.io/sampler +[net:rsc.io] [git] [!short] go get rsc.io/sampler # hg is OK by default env GOVCS= env GONOSUMDB='*' -[net] [exec:hg] [!short] go get vcs-test.golang.org/go/custom-hg-hello +[exec:hg] [!short] go get vcs-test.golang.org/go/custom-hg-hello # git can be disallowed env GOVCS=public:hg diff --git a/src/cmd/go/testdata/script/install_shadow_gopath.txt b/src/cmd/go/testdata/script/install_shadow_gopath.txt index 2039d9e7f2ece..148e6cc614704 100644 --- a/src/cmd/go/testdata/script/install_shadow_gopath.txt +++ b/src/cmd/go/testdata/script/install_shadow_gopath.txt @@ -1,8 +1,6 @@ # Tests Issue #3562 # go get foo.io (not foo.io/subdir) was not working consistently. -[!net] skip - env GO111MODULE=off env GOPATH=$WORK/gopath1${:}$WORK/gopath2 diff --git a/src/cmd/go/testdata/script/list_std_vendor.txt b/src/cmd/go/testdata/script/list_std_vendor.txt index 923e95799daf4..834babe674d9d 100644 --- a/src/cmd/go/testdata/script/list_std_vendor.txt +++ b/src/cmd/go/testdata/script/list_std_vendor.txt @@ -25,7 +25,7 @@ cmp stdout $WORK/net-deps.txt # However, 'go mod' and 'go get' subcommands should report the original module # dependencies, not the vendored packages. -[!net] stop +[!net:golang.org] stop env GOPROXY= env GOWORK=off diff --git a/src/cmd/go/testdata/script/mod_auth.txt b/src/cmd/go/testdata/script/mod_auth.txt index d8ea5867d6b65..5e2b7a918fa6d 100644 --- a/src/cmd/go/testdata/script/mod_auth.txt +++ b/src/cmd/go/testdata/script/mod_auth.txt @@ -1,4 +1,4 @@ -[!net] skip +[short] skip env GO111MODULE=on env GOPROXY=direct diff --git a/src/cmd/go/testdata/script/mod_convert.txt b/src/cmd/go/testdata/script/mod_convert.txt index 1c9d626acdfe8..922d9246c3d88 100644 --- a/src/cmd/go/testdata/script/mod_convert.txt +++ b/src/cmd/go/testdata/script/mod_convert.txt @@ -1,5 +1,6 @@ -[short] skip -[!net] skip +[!net:github.com] skip +[!net:golang.org] skip +[!net:gopkg.in] skip [!git] skip env GO111MODULE=on @@ -13,6 +14,9 @@ cd x go mod init github.com/docker/distribution cmpenv go.mod go.mod.want +[!net:google.golang.org] skip +[!net:cloud.google.com] skip + go mod download github.com/fishy/gcsbucket@v0.0.0-20180217031846-618d60fe84e0 cp $GOPATH/pkg/mod/github.com/fishy/gcsbucket@v0.0.0-20180217031846-618d60fe84e0/Gopkg.lock ../y cd ../y diff --git a/src/cmd/go/testdata/script/mod_convert_tsv_insecure.txt b/src/cmd/go/testdata/script/mod_convert_tsv_insecure.txt index 9910ce769936d..6ff69933e8acf 100644 --- a/src/cmd/go/testdata/script/mod_convert_tsv_insecure.txt +++ b/src/cmd/go/testdata/script/mod_convert_tsv_insecure.txt @@ -2,7 +2,7 @@ env GO111MODULE=on env GOPROXY=direct env GOSUMDB=off -[!net] skip +[short] skip [!git] skip # secure fetch should report insecure warning diff --git a/src/cmd/go/testdata/script/mod_download_git_decorate_full.txt b/src/cmd/go/testdata/script/mod_download_git_decorate_full.txt index 997b502b247b9..080ccf072e027 100644 --- a/src/cmd/go/testdata/script/mod_download_git_decorate_full.txt +++ b/src/cmd/go/testdata/script/mod_download_git_decorate_full.txt @@ -1,6 +1,6 @@ env GO111MODULE=on -[!net] skip +[short] skip [!git] skip env GOPROXY=direct @@ -25,4 +25,4 @@ stdout 'vcs-test.golang.org/git/gitrepo1.git v1.2.3' -- $WORK/home/gopher/.gitconfig -- [log] - decorate = full \ No newline at end of file + decorate = full diff --git a/src/cmd/go/testdata/script/mod_download_hash.txt b/src/cmd/go/testdata/script/mod_download_hash.txt index e62a165e75908..5677e69a5d534 100644 --- a/src/cmd/go/testdata/script/mod_download_hash.txt +++ b/src/cmd/go/testdata/script/mod_download_hash.txt @@ -1,7 +1,7 @@ env GO111MODULE=on # Testing mod download with non semantic versions; turn off proxy. -[!net] skip +[!net:rsc.io] skip [!git] skip env GOPROXY=direct env GOSUMDB=off diff --git a/src/cmd/go/testdata/script/mod_download_insecure_redirect.txt b/src/cmd/go/testdata/script/mod_download_insecure_redirect.txt index fed5b8da4bf1a..20a6ac2aa03ad 100644 --- a/src/cmd/go/testdata/script/mod_download_insecure_redirect.txt +++ b/src/cmd/go/testdata/script/mod_download_insecure_redirect.txt @@ -1,6 +1,6 @@ # golang.org/issue/29591: 'go get' was following plain-HTTP redirects even without -insecure (now replaced by GOINSECURE). -[!net] skip +[short] skip [!git] skip env GO111MODULE=on diff --git a/src/cmd/go/testdata/script/mod_download_issue51114.txt b/src/cmd/go/testdata/script/mod_download_issue51114.txt index 68cce8ca262b5..4d274d61a97c0 100644 --- a/src/cmd/go/testdata/script/mod_download_issue51114.txt +++ b/src/cmd/go/testdata/script/mod_download_issue51114.txt @@ -1,6 +1,5 @@ -[short] skip +[!net:github.com] skip [!git] skip -[!net] skip [!GOOS:linux] skip # Uses XDG_CONFIG_HOME env GIT_CONFIG_GLOBAL=$WORK/.gitconfig diff --git a/src/cmd/go/testdata/script/mod_download_private_vcs.txt b/src/cmd/go/testdata/script/mod_download_private_vcs.txt index 7459b80a6cf7d..2f72a4213a3c3 100644 --- a/src/cmd/go/testdata/script/mod_download_private_vcs.txt +++ b/src/cmd/go/testdata/script/mod_download_private_vcs.txt @@ -1,7 +1,7 @@ env GO111MODULE=on # Testing stderr for git ls-remote; turn off proxy. -[!net] skip +[!net:github.com] skip [!git] skip env GOPROXY=direct diff --git a/src/cmd/go/testdata/script/mod_download_svn.txt b/src/cmd/go/testdata/script/mod_download_svn.txt index 79e00dc9706c9..c11b4f9781497 100644 --- a/src/cmd/go/testdata/script/mod_download_svn.txt +++ b/src/cmd/go/testdata/script/mod_download_svn.txt @@ -1,4 +1,4 @@ -[!net] skip +[short] skip [!exec:svn] skip # 'go mod download' will fall back to svn+ssh once svn fails over protocols like https. diff --git a/src/cmd/go/testdata/script/mod_get_direct.txt b/src/cmd/go/testdata/script/mod_get_direct.txt index b7b052984c3ff..02b10ab6fd2a7 100644 --- a/src/cmd/go/testdata/script/mod_get_direct.txt +++ b/src/cmd/go/testdata/script/mod_get_direct.txt @@ -2,8 +2,7 @@ # 'GOPROXY=direct go get golang.org/x/tools/gopls@master' did not correctly # resolve the pseudo-version for its dependency on golang.org/x/tools. -[short] skip -[!net] skip +[!net:cloud.google.com] skip [!git] skip env GO111MODULE=on diff --git a/src/cmd/go/testdata/script/mod_get_fallback.txt b/src/cmd/go/testdata/script/mod_get_fallback.txt index 35722333d6a0e..a5119b6efe2d2 100644 --- a/src/cmd/go/testdata/script/mod_get_fallback.txt +++ b/src/cmd/go/testdata/script/mod_get_fallback.txt @@ -1,6 +1,7 @@ env GO111MODULE=on -[!net] skip +[!net:golang.org] skip +[!net:proxy.golang.org] skip env GOPROXY=https://proxy.golang.org,direct env GOSUMDB=off diff --git a/src/cmd/go/testdata/script/mod_get_fossil.txt b/src/cmd/go/testdata/script/mod_get_fossil.txt index c2d42f0f596f4..830e0de7aa2ad 100644 --- a/src/cmd/go/testdata/script/mod_get_fossil.txt +++ b/src/cmd/go/testdata/script/mod_get_fossil.txt @@ -1,4 +1,4 @@ -[!net] skip +[short] skip [!exec:fossil] skip # Regression test for 'go get' to ensure repositories diff --git a/src/cmd/go/testdata/script/mod_get_hash.txt b/src/cmd/go/testdata/script/mod_get_hash.txt index 63e9e46db1ca6..ec5549defe08c 100644 --- a/src/cmd/go/testdata/script/mod_get_hash.txt +++ b/src/cmd/go/testdata/script/mod_get_hash.txt @@ -1,7 +1,7 @@ env GO111MODULE=on env GOPROXY=direct env GOSUMDB=off -[!net] skip +[!net:golang.org] skip [!git] skip # fetch commit hash reachable from refs/heads/* and refs/tags/* is OK diff --git a/src/cmd/go/testdata/script/mod_get_major.txt b/src/cmd/go/testdata/script/mod_get_major.txt index 76c9de5cc7e12..4e0febbca26e2 100644 --- a/src/cmd/go/testdata/script/mod_get_major.txt +++ b/src/cmd/go/testdata/script/mod_get_major.txt @@ -1,4 +1,4 @@ -[!net] skip +[short] skip [!git] skip env GO111MODULE=on diff --git a/src/cmd/go/testdata/script/mod_get_pseudo.txt b/src/cmd/go/testdata/script/mod_get_pseudo.txt index 7b43c69c1d4a6..47ad54e352c17 100644 --- a/src/cmd/go/testdata/script/mod_get_pseudo.txt +++ b/src/cmd/go/testdata/script/mod_get_pseudo.txt @@ -1,7 +1,7 @@ env GO111MODULE=on # Testing git->module converter's generation of +incompatible tags; turn off proxy. -[!net] skip +[!net:github.com] skip [!git] skip env GOPROXY=direct env GOSUMDB=off diff --git a/src/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt b/src/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt index 21f900f303dd9..6019b45a2c8be 100644 --- a/src/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt +++ b/src/cmd/go/testdata/script/mod_get_pseudo_other_branch.txt @@ -6,7 +6,7 @@ env GOSUMDB=off # tag that appears in any commit that is a (transitive) parent of the commit # supplied to 'go get', regardless of branches -[!net] skip +[short] skip [!git] skip # For this test repository: diff --git a/src/cmd/go/testdata/script/mod_get_pseudo_prefix.txt b/src/cmd/go/testdata/script/mod_get_pseudo_prefix.txt index 513450d4a5af3..ac3233e040656 100644 --- a/src/cmd/go/testdata/script/mod_get_pseudo_prefix.txt +++ b/src/cmd/go/testdata/script/mod_get_pseudo_prefix.txt @@ -6,7 +6,7 @@ env GOSUMDB=off # prefixed tag in any commit that is a parent of the commit supplied # to 'go get', when using a repo with go.mod in a sub directory. -[!net] skip +[short] skip [!git] skip # For this test repository go.mod resides in sub/ (only): diff --git a/src/cmd/go/testdata/script/mod_getx.txt b/src/cmd/go/testdata/script/mod_getx.txt index dee3f747c6c38..46bb95bf58fb3 100644 --- a/src/cmd/go/testdata/script/mod_getx.txt +++ b/src/cmd/go/testdata/script/mod_getx.txt @@ -1,5 +1,4 @@ -[short] skip -[!net] skip +[!net:golang.org] skip [!git] skip env GO111MODULE=on diff --git a/src/cmd/go/testdata/script/mod_git_export_subst.txt b/src/cmd/go/testdata/script/mod_git_export_subst.txt index 44fb501fa8551..740ccbdb81e78 100644 --- a/src/cmd/go/testdata/script/mod_git_export_subst.txt +++ b/src/cmd/go/testdata/script/mod_git_export_subst.txt @@ -2,7 +2,7 @@ env GO111MODULE=on env GOPROXY=direct # Testing that git export-subst is disabled -[!net] skip +[!net:github.com] skip [!git] skip go build diff --git a/src/cmd/go/testdata/script/mod_gonoproxy.txt b/src/cmd/go/testdata/script/mod_gonoproxy.txt index 98a1d28b56206..94d03f22f266b 100644 --- a/src/cmd/go/testdata/script/mod_gonoproxy.txt +++ b/src/cmd/go/testdata/script/mod_gonoproxy.txt @@ -36,13 +36,14 @@ env GOPROXY=off stderr '^go: golang.org/x/text: module lookup disabled by GOPROXY=off$' # GONOPROXY bypasses proxy -[!net] skip +[!net:rsc.io] skip [!git] skip env GOPRIVATE=none env GONOPROXY='*/fortune' ! go get rsc.io/fortune # does not exist in real world, only on test proxy stderr 'git ls-remote' +[!net:golang.org] skip env GOSUMDB= env GONOPROXY= env GOPRIVATE='*/x' diff --git a/src/cmd/go/testdata/script/mod_gopkg_unstable.txt b/src/cmd/go/testdata/script/mod_gopkg_unstable.txt index 3608bcd79607d..856f493f30ce9 100644 --- a/src/cmd/go/testdata/script/mod_gopkg_unstable.txt +++ b/src/cmd/go/testdata/script/mod_gopkg_unstable.txt @@ -7,7 +7,7 @@ cp x.go.txt x.go cp go.mod.empty go.mod go list -[!net] skip +[!net:gopkg.in] skip [!git] skip skip # TODO(#54503): redirect gopkg.in requests to a local server and re-enable. diff --git a/src/cmd/go/testdata/script/mod_init_glide.txt b/src/cmd/go/testdata/script/mod_init_glide.txt index 2126ae5b48768..0d087eb607a83 100644 --- a/src/cmd/go/testdata/script/mod_init_glide.txt +++ b/src/cmd/go/testdata/script/mod_init_glide.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=on diff --git a/src/cmd/go/testdata/script/mod_invalid_version.txt b/src/cmd/go/testdata/script/mod_invalid_version.txt index d1e1da4492512..c841f27a214ff 100644 --- a/src/cmd/go/testdata/script/mod_invalid_version.txt +++ b/src/cmd/go/testdata/script/mod_invalid_version.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:golang.org] skip [!git] skip env GO111MODULE=on @@ -178,6 +178,8 @@ cd .. ! go list -m golang.org/x/text stderr 'golang.org/x/text@v0.1.1-0.20170915032832-14c0d48ead0c\+incompatible: invalid version: \+incompatible suffix not allowed: major version v0 is compatible' +[!net:github.com] stop + # The pseudo-version for a commit after a tag with a non-matching major version # should instead be based on the last matching tag. cp go.mod.orig go.mod diff --git a/src/cmd/go/testdata/script/mod_list_direct.txt b/src/cmd/go/testdata/script/mod_list_direct.txt index 3e7c479d66495..8bab330ac82c9 100644 --- a/src/cmd/go/testdata/script/mod_list_direct.txt +++ b/src/cmd/go/testdata/script/mod_list_direct.txt @@ -2,7 +2,7 @@ env GO111MODULE=on env GOPROXY=direct env GOSUMDB=off -[!net] skip +[short] skip [!git] skip # golang.org/issue/33099: if an import path ends in a major-version suffix, diff --git a/src/cmd/go/testdata/script/mod_list_odd_tags.txt b/src/cmd/go/testdata/script/mod_list_odd_tags.txt index b413e87e18ac5..232754eacaba5 100644 --- a/src/cmd/go/testdata/script/mod_list_odd_tags.txt +++ b/src/cmd/go/testdata/script/mod_list_odd_tags.txt @@ -1,6 +1,5 @@ [short] skip [!git] skip -[!net] skip env GOPROXY=direct diff --git a/src/cmd/go/testdata/script/mod_missing_repo.txt b/src/cmd/go/testdata/script/mod_missing_repo.txt index 4b403fe51e1dc..d0076f7b3bdfd 100644 --- a/src/cmd/go/testdata/script/mod_missing_repo.txt +++ b/src/cmd/go/testdata/script/mod_missing_repo.txt @@ -2,7 +2,7 @@ # subgroups could not be fetched because the server returned bogus go-import # tags for prefixes of the module path. -[!net] skip +[short] skip [!git] skip env GO111MODULE=on diff --git a/src/cmd/go/testdata/script/mod_prefer_compatible.txt b/src/cmd/go/testdata/script/mod_prefer_compatible.txt index 7ba5eb4fa9cb0..57036b95be8bc 100644 --- a/src/cmd/go/testdata/script/mod_prefer_compatible.txt +++ b/src/cmd/go/testdata/script/mod_prefer_compatible.txt @@ -2,7 +2,8 @@ # @latest, @upgrade, and @patch should prefer compatible versions over # +incompatible ones, even if offered by a proxy. -[!net] skip +[!net:github.com] skip +[!net:proxy.golang.org] skip env GO111MODULE=on env GOPROXY= diff --git a/src/cmd/go/testdata/script/mod_proxy_errors.txt b/src/cmd/go/testdata/script/mod_proxy_errors.txt index 9cd1a824f0848..99a4ef1c5dd98 100644 --- a/src/cmd/go/testdata/script/mod_proxy_errors.txt +++ b/src/cmd/go/testdata/script/mod_proxy_errors.txt @@ -1,4 +1,4 @@ -[!net] skip +[short] skip env GO111MODULE=on env GOSUMDB=off diff --git a/src/cmd/go/testdata/script/mod_proxy_https.txt b/src/cmd/go/testdata/script/mod_proxy_https.txt index a5e28dd0b9771..c87a0d9450616 100644 --- a/src/cmd/go/testdata/script/mod_proxy_https.txt +++ b/src/cmd/go/testdata/script/mod_proxy_https.txt @@ -5,7 +5,7 @@ env GOPROXY=$WORK/proxydir ! go list -versions -m golang.org/x/text stderr 'invalid proxy URL.*proxydir' -[!net] stop +[!net:proxy.golang.org] stop # GOPROXY HTTPS paths may elide the "https://" prefix. # (See golang.org/issue/32191.) diff --git a/src/cmd/go/testdata/script/mod_pseudo_cache.txt b/src/cmd/go/testdata/script/mod_pseudo_cache.txt index a7ceac42b4262..bcaefa2f79f5c 100644 --- a/src/cmd/go/testdata/script/mod_pseudo_cache.txt +++ b/src/cmd/go/testdata/script/mod_pseudo_cache.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:golang.org] skip [!git] skip env GO111MODULE=on diff --git a/src/cmd/go/testdata/script/mod_replace_gopkgin.txt b/src/cmd/go/testdata/script/mod_replace_gopkgin.txt index 04b79dd55d5a9..91008f920f31b 100644 --- a/src/cmd/go/testdata/script/mod_replace_gopkgin.txt +++ b/src/cmd/go/testdata/script/mod_replace_gopkgin.txt @@ -7,8 +7,7 @@ skip 'skipping test that depends on an unreliable third-party server; see https://go.dev/issue/54503' # TODO(#54043): Make this test hermetic and re-enable it. -[short] skip -[!net] skip +[!net:gopkg.in] skip [!git] skip env GO111MODULE=on diff --git a/src/cmd/go/testdata/script/mod_retract_pseudo_base.txt b/src/cmd/go/testdata/script/mod_retract_pseudo_base.txt index c52f0b851e15d..87b440dc7ea79 100644 --- a/src/cmd/go/testdata/script/mod_retract_pseudo_base.txt +++ b/src/cmd/go/testdata/script/mod_retract_pseudo_base.txt @@ -2,7 +2,7 @@ # as the base. # Verifies golang.org/issue/41700. -[!net] skip +[short] skip [!git] skip env GOPROXY=direct env GOSUMDB=off diff --git a/src/cmd/go/testdata/script/mod_sumdb_file_path.txt b/src/cmd/go/testdata/script/mod_sumdb_file_path.txt index d89ad1aa338c7..c95a667bfdcad 100644 --- a/src/cmd/go/testdata/script/mod_sumdb_file_path.txt +++ b/src/cmd/go/testdata/script/mod_sumdb_file_path.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:proxy.golang.org] skip env GO111MODULE=on env GOSUMDB= diff --git a/src/cmd/go/testdata/script/mod_sumdb_golang.txt b/src/cmd/go/testdata/script/mod_sumdb_golang.txt index 7dd6cdc066765..8698412f786ad 100644 --- a/src/cmd/go/testdata/script/mod_sumdb_golang.txt +++ b/src/cmd/go/testdata/script/mod_sumdb_golang.txt @@ -11,7 +11,8 @@ stdout '^sum.golang.org$' # Download direct from github. -[!net] skip +[!net:proxy.golang.org] skip +[!net:sum.golang.org] skip [!git] skip env GOSUMDB=sum.golang.org env GOPROXY=direct diff --git a/src/cmd/go/testdata/script/mod_vcs_missing.txt b/src/cmd/go/testdata/script/mod_vcs_missing.txt index 9e6e371927bef..7f63e9de217f5 100644 --- a/src/cmd/go/testdata/script/mod_vcs_missing.txt +++ b/src/cmd/go/testdata/script/mod_vcs_missing.txt @@ -1,5 +1,5 @@ [exec:bzr] skip 'tests NOT having bzr' -[!net] skip +[!net:launchpad.net] skip env GO111MODULE=on env GOPROXY=direct diff --git a/src/cmd/go/testdata/script/reuse_git.txt b/src/cmd/go/testdata/script/reuse_git.txt index 4f9e0dd17fdb2..0357d670f4324 100644 --- a/src/cmd/go/testdata/script/reuse_git.txt +++ b/src/cmd/go/testdata/script/reuse_git.txt @@ -1,6 +1,5 @@ [short] skip [!git] skip -[!net] skip env GO111MODULE=on env GOPROXY=direct diff --git a/src/cmd/go/testdata/script/vendor_list_issue11977.txt b/src/cmd/go/testdata/script/vendor_list_issue11977.txt index 35c82c7b21092..f519175d8aee1 100644 --- a/src/cmd/go/testdata/script/vendor_list_issue11977.txt +++ b/src/cmd/go/testdata/script/vendor_list_issue11977.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/vendor_test_issue11864.txt b/src/cmd/go/testdata/script/vendor_test_issue11864.txt index ff179cbe8b2d4..9e34811bb4a72 100644 --- a/src/cmd/go/testdata/script/vendor_test_issue11864.txt +++ b/src/cmd/go/testdata/script/vendor_test_issue11864.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off diff --git a/src/cmd/go/testdata/script/vendor_test_issue14613.txt b/src/cmd/go/testdata/script/vendor_test_issue14613.txt index 7822deeeda915..9535fc13e9539 100644 --- a/src/cmd/go/testdata/script/vendor_test_issue14613.txt +++ b/src/cmd/go/testdata/script/vendor_test_issue14613.txt @@ -1,4 +1,4 @@ -[!net] skip +[!net:github.com] skip [!git] skip env GO111MODULE=off