internal/testenv: remove SetModVendor

It turns out not to be necessary. Russ expressed a preference for
avoiding module fetches over making 'go mod tidy' work within std and
cmd right away, so for now we will make the loader use the vendor
directory for the standard library even if '-mod=vendor' is not set
explicitly.

Updates #30228

Change-Id: Idf7208e63da8cb7bfe281b93ec21b61d40334947
Reviewed-on: https://go-review.googlesource.com/c/go/+/166357
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>

10 files changed, 0 insertions, 18 deletions

diff --git a/src/cmd/addr2line/addr2line_test.go b/src/cmd/addr2line/addr2line_test.go
index 183a22f8f3..22bf1379bb 100644
--- a/src/cmd/addr2line/addr2line_test.go
+++ b/src/cmd/addr2line/addr2line_test.go
@@ -115,5 +115,3 @@ func TestAddr2Line(t *testing.T) {
 	testAddr2Line(t, exepath, syms[symName])
 	testAddr2Line(t, exepath, "0x"+syms[symName])
 }
-
-func init() { testenv.SetModVendor() }
diff --git a/src/cmd/compile/internal/gc/scope_test.go b/src/cmd/compile/internal/gc/scope_test.go
index e4861c686c..e327dc02af 100644
--- a/src/cmd/compile/internal/gc/scope_test.go
+++ b/src/cmd/compile/internal/gc/scope_test.go
@@ -202,8 +202,6 @@ var testfile = []testline{
 
 const detailOutput = false
 
-func init() { testenv.SetModVendor() }
-
 // Compiles testfile checks that the description of lexical blocks emitted
 // by the linker in debug_info, for each function in the main package,
 // corresponds to what we expect it to be.
diff --git a/src/cmd/cover/cover_test.go b/src/cmd/cover/cover_test.go
index d7e6ca99b7..f002442b63 100644
--- a/src/cmd/cover/cover_test.go
+++ b/src/cmd/cover/cover_test.go
@@ -77,8 +77,6 @@ var debug = flag.Bool("debug", false, "keep rewritten files for debugging")
 // We use TestMain to set up a temporary directory and remove it when
 // the tests are done.
 func TestMain(m *testing.M) {
-	testenv.SetModVendor()
-
 	dir, err := ioutil.TempDir("", "gotestcover")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
diff --git a/src/cmd/internal/obj/x86/obj6_test.go b/src/cmd/internal/obj/x86/obj6_test.go
index 2b1a729c8f..c5399744f2 100644
--- a/src/cmd/internal/obj/x86/obj6_test.go
+++ b/src/cmd/internal/obj/x86/obj6_test.go
@@ -134,8 +134,6 @@ func parseOutput(t *testing.T, td *ParsedTestData, asmout []byte) {
 	}
 }
 
-func init() { testenv.SetModVendor() }
-
 func TestDynlink(t *testing.T) {
 	testenv.MustHaveGoBuild(t)
 
diff --git a/src/cmd/link/internal/ld/ld_test.go b/src/cmd/link/internal/ld/ld_test.go
index 219b2a63ca..0816429316 100644
--- a/src/cmd/link/internal/ld/ld_test.go
+++ b/src/cmd/link/internal/ld/ld_test.go
@@ -13,8 +13,6 @@ import (
 	"testing"
 )
 
-func init() { testenv.SetModVendor() }
-
 func TestUndefinedRelocErrors(t *testing.T) {
 	t.Parallel()
 	testenv.MustHaveGoBuild(t)
diff --git a/src/cmd/link/link_test.go b/src/cmd/link/link_test.go
index 5043a778ca..5200c3a6f0 100644
--- a/src/cmd/link/link_test.go
+++ b/src/cmd/link/link_test.go
@@ -38,8 +38,6 @@ func TestLargeSymName(t *testing.T) {
 	_ = AuthorPaidByTheColumnInch
 }
 
-func init() { testenv.SetModVendor() }
-
 func TestIssue21703(t *testing.T) {
 	t.Parallel()
 
diff --git a/src/cmd/nm/nm_test.go b/src/cmd/nm/nm_test.go
index 82f4235510..8176ddd7f4 100644
--- a/src/cmd/nm/nm_test.go
+++ b/src/cmd/nm/nm_test.go
@@ -30,8 +30,6 @@ func testMain(m *testing.M) int {
 		return 0
 	}
 
-	testenv.SetModVendor()
-
 	tmpDir, err := ioutil.TempDir("", "TestNM")
 	if err != nil {
 		fmt.Println("TempDir failed:", err)
diff --git a/src/cmd/objdump/objdump_test.go b/src/cmd/objdump/objdump_test.go
index 7c874e853b..be9fe5274a 100644
--- a/src/cmd/objdump/objdump_test.go
+++ b/src/cmd/objdump/objdump_test.go
@@ -24,7 +24,6 @@ func TestMain(m *testing.M) {
 	if !testenv.HasGoBuild() {
 		return
 	}
-	testenv.SetModVendor()
 
 	var exitcode int
 	if err := buildObjdump(); err == nil {
diff --git a/src/cmd/vet/all/main.go b/src/cmd/vet/all/main.go
index 018eba4d6e..6e4a4e297e 100644
--- a/src/cmd/vet/all/main.go
+++ b/src/cmd/vet/all/main.go
@@ -44,7 +44,6 @@ func main() {
 	log.SetPrefix("vet/all: ")
 	log.SetFlags(log.Lshortfile)
 
-	testenv.SetModVendor()
 	var err error
 	cmdGoPath, err = testenv.GoTool()
 	if err != nil {
diff --git a/src/cmd/vet/vet_test.go b/src/cmd/vet/vet_test.go
index 62c28fb9a2..5d8139d977 100644
--- a/src/cmd/vet/vet_test.go
+++ b/src/cmd/vet/vet_test.go
@@ -32,8 +32,6 @@ func TestMain(m *testing.M) {
 }
 
 func testMain(m *testing.M) int {
-	testenv.SetModVendor()
-
 	dir, err := ioutil.TempDir("", "vet_test")
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)