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 <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Robert Findley <rfindley@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>

gopls/internal/test/marker/marker_test.go

@@ -87,7 +87,11 @@ func TestMain(m *testing.M) {
 func Test(t *testing.T) {
 	if testing.Short() {
 		builder := os.Getenv("GO_BUILDER_NAME")
-		if strings.HasPrefix(builder, "darwin-") || builder == "solaris-amd64-oraclerel" {
+		// Note that HasPrefix(builder, "darwin-" only matches legacy builders.
+		// LUCI builder names start with x_tools-goN.NN.
+		// We want to exclude solaris on both legacy and LUCI builders, as
+		// it is timing out.
+		if strings.HasPrefix(builder, "darwin-") || strings.Contains(builder, "solaris") {
 			t.Skip("golang/go#64473: skipping with -short: this test is too slow on darwin and solaris builders")
 		}
 	}