From: Than McIntosh <thanm@google.com>
Date: Wed, 23 Nov 2022 11:47:14 +0000 (-0500)
Subject: testing: remove stale builder names from windows tests
X-Git-Tag: go1.20rc1~72
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0fd7be7ee5f36215b5d6b8f23f35d60bf749805a;p=gostls13.git

testing: remove stale builder names from windows tests

A couple of the windows runtime tests were being gated by "if
testenv.Builder() == ..." guards that referred to builders that have
long since been obsoleted (e.g. "windows-amd64-gce"). Use a more
generic guard instead, checking for windows-<goarch> prefix.

Change-Id: Ibdb9ce2b0cfe10bba986bd210a5b8ce5c1b1d675
Reviewed-on: https://go-review.googlesource.com/c/go/+/453035
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Than McIntosh <thanm@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
---

diff --git a/src/runtime/syscall_windows_test.go b/src/runtime/syscall_windows_test.go
index f38316a809..abc28387e6 100644
--- a/src/runtime/syscall_windows_test.go
+++ b/src/runtime/syscall_windows_test.go
@@ -1215,7 +1215,7 @@ func TestBigStackCallbackSyscall(t *testing.T) {
 
 // wantLoadLibraryEx reports whether we expect LoadLibraryEx to work for tests.
 func wantLoadLibraryEx() bool {
-	return testenv.Builder() == "windows-amd64-gce" || testenv.Builder() == "windows-386-gce"
+	return testenv.Builder() != "" && (runtime.GOARCH == "amd64" || runtime.GOARCH == "386")
 }
 
 func TestLoadLibraryEx(t *testing.T) {