Skip to content

Commit

Permalink
internal/testenv: update linux-arm to linux-arm-scaleway
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
findleyr committed May 25, 2021
1 parent 98f8936 commit 874765c
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions internal/testenv/testenv.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import (
"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.
Expand Down Expand Up @@ -247,8 +248,9 @@ func NeedsGoBuild(t Testing) {
// 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)")
Expand Down

0 comments on commit 874765c

Please sign in to comment.