Skip to content

Commit ed2b1e9

Browse files
committed
gopls/internal/regtest: exit if small machine
The issues we've experienced with linux-arm appear to simply be due to memory constraints, which is already tracked in golang/go#32834 and guarded by testenv.ExitIfSmallMachine. No issues on the larger linux-arm-aws builder. Remove our guard in favor of testenv.ExitIfSmallMachine. Fixes golang/go#43355 Change-Id: Idea84e4fff13e13ab9a7eb3414c6133fff0f1e8e Reviewed-on: https://go-review.googlesource.com/c/tools/+/291469 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 5bd3da9 commit ed2b1e9

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

gopls/internal/regtest/regtest.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ func DefaultModes() Mode {
8383
}
8484

8585
// Main sets up and tears down the shared regtest state.
86-
//
87-
// TODO(rFindley): This is probably not necessary, and complicates things now
88-
// that we have multiple regtest suites. Consider removing.
8986
func Main(m *testing.M) {
87+
testenv.ExitIfSmallMachine()
88+
9089
flag.Parse()
9190
if os.Getenv("_GOPLS_TEST_BINARY_RUN_AS_GOPLS") == "true" {
9291
tool.Main(context.Background(), cmd.New("gopls", "", nil, nil), os.Args[1:])

gopls/internal/regtest/runner.go

-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ var longBuilders = map[string]string{
299299
"openbsd-386-64": "golang.org/issues/42789",
300300
"openbsd-386-68": "golang.org/issues/42789",
301301
"openbsd-amd64-68": "golang.org/issues/42789",
302-
"linux-arm": "golang.org/issues/43355",
303302
"darwin-amd64-10_12": "",
304303
"freebsd-amd64-race": "",
305304
"illumos-amd64": "",

0 commit comments

Comments
 (0)