From 0fd7be7ee5f36215b5d6b8f23f35d60bf749805a Mon Sep 17 00:00:00 2001 From: Than McIntosh Date: Wed, 23 Nov 2022 06:47:14 -0500 Subject: [PATCH] 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- prefix. Change-Id: Ibdb9ce2b0cfe10bba986bd210a5b8ce5c1b1d675 Reviewed-on: https://go-review.googlesource.com/c/go/+/453035 Reviewed-by: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov Run-TryBot: Than McIntosh TryBot-Result: Gopher Robot --- src/runtime/syscall_windows_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- 2.48.1