Skip to content

Commit 739a5af

Browse files
findleyrgopherbot
authored andcommitted
gopls/internal/test/marker: skip on the freebsd race builder
The marker tests frequently time out on the freebsd race builder. Skip them to reduce noise. (We don't currently have resources to investigate). Fixes golang/go#71731 Change-Id: I2e27c2e8063b6d5e698eb9d1b5c32d08914fcc77 Reviewed-on: https://go-review.googlesource.com/c/tools/+/651895 Auto-Submit: Robert Findley <[email protected]> Reviewed-by: Peter Weinberger <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 274b237 commit 739a5af

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

gopls/internal/test/marker/marker_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ func Test(t *testing.T) {
9696
if strings.HasPrefix(builder, "darwin-") || strings.Contains(builder, "solaris") {
9797
t.Skip("golang/go#64473: skipping with -short: this test is too slow on darwin and solaris builders")
9898
}
99+
if strings.HasSuffix(builder, "freebsd-amd64-race") {
100+
t.Skip("golang/go#71731: the marker tests are too slow to run on the amd64-race builder")
101+
}
99102
}
100103
// The marker tests must be able to run go/packages.Load.
101104
testenv.NeedsGoPackages(t)
@@ -658,7 +661,7 @@ type stringListValue []string
658661

659662
func (l *stringListValue) Set(s string) error {
660663
if s != "" {
661-
for _, d := range strings.Split(s, ",") {
664+
for d := range strings.SplitSeq(s, ",") {
662665
*l = append(*l, strings.TrimSpace(d))
663666
}
664667
}
@@ -1838,7 +1841,7 @@ func removeDiagnostic(mark marker, loc protocol.Location, matchEnd bool, re *reg
18381841
diags := mark.run.diags[key]
18391842
for i, diag := range diags {
18401843
if re.MatchString(diag.Message) && (!matchEnd || diag.Range.End == loc.Range.End) {
1841-
mark.run.diags[key] = append(diags[:i], diags[i+1:]...)
1844+
mark.run.diags[key] = slices.Delete(diags, i, i+1)
18421845
return diag, true
18431846
}
18441847
}

0 commit comments

Comments
 (0)