misc/reboot: move to cmd/internal/bootstrap_test

This is the last test run from misc by dist. For golang#37486. Change-Id: I1a70ded29ba0de548c9a16611ba987a258121e80 Reviewed-on: https://go-review.googlesource.com/c/go/+/493606 TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> Run-TryBot: Austin Clements <austin@google.com> Reviewed-by: Bryan Mills <bcmills@google.com>
aytanet · May 12, 2023 · 3943fc1 · 3943fc1
1 parent b26c392
commit 3943fc1
Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
@@ -887,13 +887,6 @@ func (t *tester) registerTests() {
 	if goos == "darwin" || ((goos == "linux" || goos == "windows") && goarch == "amd64") {
 		t.registerTest("api", "", &goTest{dir: "cmd/api", timeout: 5 * time.Minute, testFlags: []string{"-check"}})
 	}
-
-	// Ensure that the toolchain can bootstrap itself.
-	// This test adds another ~45s to all.bash if run sequentially, so run it only on the builders.
-	// Not meaningful on wasm/js or wasm/wasip1.
-	if os.Getenv("GO_BUILDER_NAME") != "" && goos != "android" && !t.iOS() && goos != "js" && goos != "wasip1" {
-		t.registerTest("reboot", "", &goTest{dir: "../misc/reboot", timeout: 5 * time.Minute})
-	}
 }
 
 // isRegisteredTestName reports whether a test named testName has already

diff --git a/misc/reboot/experiment_toolid_test.go → .../bootstrap_test/experiment_toolid_test.go b/misc/reboot/experiment_toolid_test.go → .../bootstrap_test/experiment_toolid_test.go
@@ -5,12 +5,13 @@
 //go:build explicit
 // +build explicit
 
-// Package experiment_toolid_test verifies that GOEXPERIMENT settings built
+// This test verifies that GOEXPERIMENT settings built
 // into the toolchain influence tool ids in the Go command.
 // This test requires bootstrapping the toolchain twice, so it's very expensive.
 // It must be run explicitly with -tags=explicit.
 // Verifies golang.org/issue/33091.
-package reboot_test
+
+package bootstrap_test
 
 import (
 	"bytes"

diff --git a/misc/reboot/overlaydir_test.go → ...nternal/bootstrap_test/overlaydir_test.go b/misc/reboot/overlaydir_test.go → ...nternal/bootstrap_test/overlaydir_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.
 
-package reboot_test
+package bootstrap_test
 
 import (
 	"io"

diff --git a/misc/reboot/reboot_test.go → ...md/internal/bootstrap_test/reboot_test.go b/misc/reboot/reboot_test.go → ...md/internal/bootstrap_test/reboot_test.go
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Package reboot_test verifies that the current GOROOT can be used to bootstrap
+// Package bootstrap_test verifies that the current GOROOT can be used to bootstrap
 // itself.
-package reboot_test
+package bootstrap_test
 
 import (
 	"fmt"
+	"internal/testenv"
 	"io"
 	"os"
 	"os/exec"
@@ -22,12 +23,13 @@ func TestRepeatBootstrap(t *testing.T) {
 	if testing.Short() {
 		t.Skipf("skipping test that rebuilds the entire toolchain")
 	}
-
-	realGoroot, err := filepath.Abs(filepath.Join("..", ".."))
-	if err != nil {
-		t.Fatal(err)
+	switch runtime.GOOS {
+	case "android", "ios", "js", "wasip1":
+		t.Skipf("skipping because the toolchain does not have to bootstrap on GOOS=%s", runtime.GOOS)
 	}
 
+	realGoroot := testenv.GOROOT(t)
+
 	// To ensure that bootstrapping doesn't unexpectedly depend
 	// on the Go repo's git metadata, add a fake (unreadable) git
 	// directory above the simulated GOROOT.