Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove test skip for non-default GOTOOLCHAIN: fixed upstream #1250

Merged
merged 1 commit into from
Jun 14, 2024
Merged

Remove test skip for non-default GOTOOLCHAIN: fixed upstream #1250

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions patches/0008-Update-default-go.env.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ Date: Thu, 8 Jun 2023 14:17:13 +0200
Subject: [PATCH] Update default go.env

---
go.env | 6 ++++--
src/cmd/go/testdata/script/env_changed.txt | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
go.env | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/go.env b/go.env
index 6ff2b921d464bc..4aca2ff2c63dbc 100644
Expand All @@ -23,16 +22,3 @@ index 6ff2b921d464bc..4aca2ff2c63dbc 100644
# See https://go.dev/doc/toolchain for details.
-GOTOOLCHAIN=auto
+GOTOOLCHAIN=local
diff --git a/src/cmd/go/testdata/script/env_changed.txt b/src/cmd/go/testdata/script/env_changed.txt
index 37d6571938cba6..204c39c5b18891 100644
--- a/src/cmd/go/testdata/script/env_changed.txt
+++ b/src/cmd/go/testdata/script/env_changed.txt
@@ -1,5 +1,8 @@
# Test query for non-defaults in the env

+# See https://github.com/golang/go/issues/67793
+skip 'test relies on the standard go.env file, but Microsoft Go has a modified go.env file'
+
env GOROOT=./a
env GOTOOLCHAIN=local
env GOSUMDB=nodefault