internal/testenv: update linux-arm to linux-arm-scaleway
CL 303230 renamed the linux-arm builder to linux-arm-scaleway, but the
x/tools ExitIfSmallMachine guard was not updated accordingly, resulting
in consistent failures for some tests.
For golang/go#45931
For golang/go#46183
Updates golang/go#32834
Change-Id: Ief5f17fc61cb38cf6b7cf63b6cd5e64f9d56261e
Reviewed-on: https://go-review.googlesource.com/c/tools/+/322409
Trust: Robert Findley <rfindley@google.com>
Run-TryBot: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Rebecca Stambler <rstambler@golang.org>
diff --git a/internal/testenv/testenv.go b/internal/testenv/testenv.go
index 65b7953..2f7d2a0 100644
--- a/internal/testenv/testenv.go
+++ b/internal/testenv/testenv.go
@@ -10,12 +10,13 @@
"bytes"
"fmt"
"go/build"
- exec "golang.org/x/sys/execabs"
"io/ioutil"
"os"
"runtime"
"strings"
"sync"
+
+ exec "golang.org/x/sys/execabs"
)
// Testing is an abstraction of a *testing.T.
@@ -247,8 +248,9 @@
// It should be called from within a TestMain function.
func ExitIfSmallMachine() {
switch os.Getenv("GO_BUILDER_NAME") {
- case "linux-arm":
- fmt.Fprintln(os.Stderr, "skipping test: linux-arm builder lacks sufficient memory (https://golang.org/issue/32834)")
+ case "linux-arm-scaleway":
+ // "linux-arm" was renamed to "linux-arm-scaleway" in CL 303230.
+ fmt.Fprintln(os.Stderr, "skipping test: linux-arm-scaleway builder lacks sufficient memory (https://golang.org/issue/32834)")
os.Exit(0)
case "plan9-arm":
fmt.Fprintln(os.Stderr, "skipping test: plan9-arm builder lacks sufficient memory (https://golang.org/issue/38772)")
