Skip to content

Commit 874765c

Browse files
committed
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 <[email protected]> Run-TryBot: Robert Findley <[email protected]> gopls-CI: kokoro <[email protected]> TryBot-Result: Go Bot <[email protected]> Reviewed-by: Rebecca Stambler <[email protected]>
1 parent 98f8936 commit 874765c

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

internal/testenv/testenv.go

+5-3
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ import (
1010
"bytes"
1111
"fmt"
1212
"go/build"
13-
exec "golang.org/x/sys/execabs"
1413
"io/ioutil"
1514
"os"
1615
"runtime"
1716
"strings"
1817
"sync"
18+
19+
exec "golang.org/x/sys/execabs"
1920
)
2021

2122
// Testing is an abstraction of a *testing.T.
@@ -247,8 +248,9 @@ func NeedsGoBuild(t Testing) {
247248
// It should be called from within a TestMain function.
248249
func ExitIfSmallMachine() {
249250
switch os.Getenv("GO_BUILDER_NAME") {
250-
case "linux-arm":
251-
fmt.Fprintln(os.Stderr, "skipping test: linux-arm builder lacks sufficient memory (https://golang.org/issue/32834)")
251+
case "linux-arm-scaleway":
252+
// "linux-arm" was renamed to "linux-arm-scaleway" in CL 303230.
253+
fmt.Fprintln(os.Stderr, "skipping test: linux-arm-scaleway builder lacks sufficient memory (https://golang.org/issue/32834)")
252254
os.Exit(0)
253255
case "plan9-arm":
254256
fmt.Fprintln(os.Stderr, "skipping test: plan9-arm builder lacks sufficient memory (https://golang.org/issue/38772)")

0 commit comments

Comments
 (0)