Skip to content

Commit 8fcb5f0

Browse files
committed
gopls/internal/test/marker: skip on LUCI solaris builders
Fixes golang/go#64473 Change-Id: I373b8fa2bb42aad711686b6b907ac56d0e8d452b Reviewed-on: https://go-review.googlesource.com/c/tools/+/562035 LUCI-TryBot-Result: Go LUCI <[email protected]> Auto-Submit: Robert Findley <[email protected]> Reviewed-by: Bryan Mills <[email protected]>
1 parent 08bd728 commit 8fcb5f0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

gopls/internal/test/marker/marker_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ func TestMain(m *testing.M) {
8787
func Test(t *testing.T) {
8888
if testing.Short() {
8989
builder := os.Getenv("GO_BUILDER_NAME")
90-
if strings.HasPrefix(builder, "darwin-") || builder == "solaris-amd64-oraclerel" {
90+
// Note that HasPrefix(builder, "darwin-" only matches legacy builders.
91+
// LUCI builder names start with x_tools-goN.NN.
92+
// We want to exclude solaris on both legacy and LUCI builders, as
93+
// it is timing out.
94+
if strings.HasPrefix(builder, "darwin-") || strings.Contains(builder, "solaris") {
9195
t.Skip("golang/go#64473: skipping with -short: this test is too slow on darwin and solaris builders")
9296
}
9397
}

0 commit comments

Comments
 (0)