[release-branch.go1.21] internal/testenv: support the LUCI mobile builders in tests

This change updates the testenv tests to correctly match on future LUCI
builder names for mobile builders. This isn't a problem today because
those haven't been set up yet, but the builder names are structured and
it's clear where the modifiers will appear. Might as well set them up
now.

For #65473.
Fixes #65475.

Change-Id: I244b88a62a90312c0f3ff2360527d58531070362
Reviewed-on: https://go-review.googlesource.com/c/go/+/558597
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
(cherry picked from commit 5c7c24ce827b10982245951f6c2b1bbf0abc5aae)
Reviewed-on: https://go-review.googlesource.com/c/go/+/560895

diff --git a/src/internal/testenv/testenv_test.go b/src/internal/testenv/testenv_test.go
index ce3b3b953b8d117ed19a0dbc17e41f9a58cce988..e4ef3bc7acbbd8e584ff1bad52fe2044288f10a1 100644 (file)
--- a/src/internal/testenv/testenv_test.go
+++ b/src/internal/testenv/testenv_test.go
@@ -78,7 +78,7 @@ func TestHasGoBuild(t *testing.T) {
                // we will presumably find out about it when those tests fail.)
                switch runtime.GOOS {
                case "ios":
-                       if strings.HasSuffix(b, "-corellium") {
+                       if isCorelliumBuilder(b) {
                                // The corellium environment is self-hosting, so it should be able
                                // to build even though real "ios" devices can't exec.
                        } else {
@@ -89,7 +89,7 @@ func TestHasGoBuild(t *testing.T) {
                                return
                        }
                case "android":
-                       if strings.HasSuffix(b, "-emu") && platform.MustLinkExternal(runtime.GOOS, runtime.GOARCH, false) {
+                       if isEmulatedBuilder(b) && platform.MustLinkExternal(runtime.GOOS, runtime.GOARCH, false) {
                                // As of 2023-05-02, the test environment on the emulated builders is
                                // missing a C linker.
                                t.Logf("HasGoBuild is false on %s", b)
@@ -153,7 +153,7 @@ func TestMustHaveExec(t *testing.T) {
                        t.Errorf("expected MustHaveExec to skip on %v", runtime.GOOS)
                }
        case "ios":
-               if b := testenv.Builder(); strings.HasSuffix(b, "-corellium") && !hasExec {
+               if b := testenv.Builder(); isCorelliumBuilder(b) && !hasExec {
                        // Most ios environments can't exec, but the corellium builder can.
                        t.Errorf("expected MustHaveExec not to skip on %v", b)
                }
@@ -163,3 +163,23 @@ func TestMustHaveExec(t *testing.T) {
                }
        }
 }
+
+func isCorelliumBuilder(builderName string) bool {
+       // Support both the old infra's builder names and the LUCI builder names.
+       // The former's names are ad-hoc so we could maintain this invariant on
+       // the builder side. The latter's names are structured, and "corellium" will
+       // appear as a "host" suffix after the GOOS and GOARCH, which always begin
+       // with an underscore.
+       return strings.HasSuffix(builderName, "-corellium") || strings.Contains(builderName, "_corellium")
+}
+
+func isEmulatedBuilder(builderName string) bool {
+       // Support both the old infra's builder names and the LUCI builder names.
+       // The former's names are ad-hoc so we could maintain this invariant on
+       // the builder side. The latter's names are structured, and the signifier
+       // of emulation "emu" will appear as a "host" suffix after the GOOS and
+       // GOARCH because it modifies the run environment in such a way that it
+       // the target GOOS and GOARCH may not match the host. This suffix always
+       // begins with an underscore.
+       return strings.HasSuffix(builderName, "-emu") || strings.Contains(builderName, "_emu")
+}
\ No newline at end of file