Browse Source

go 1.18.x now sets -buildvcs=false for `go test`

That is, since Go 1.18.1, released back in April 2022.
We no longer need to worry about the buggy Go 1.18.0.

While here, use a clearer env var name; the settings are build settings.
Daniel Martí 2 months ago
parent
commit
4155854a2e
2 changed files with 7 additions and 10 deletions
  1. 1 1
      main.go
  2. 6 9
      testdata/scripts/help.txt

+ 1 - 1
main.go

@@ -329,7 +329,7 @@ func mainErr(args []string) error {
 		}
 
 		// For the tests.
-		if v := os.Getenv("GARBLE_TEST_SETTINGS"); v != "" {
+		if v := os.Getenv("GARBLE_TEST_BUILDSETTINGS"); v != "" {
 			var extra []debug.BuildSetting
 			if err := json.Unmarshal([]byte(v), &extra); err != nil {
 				return err

+ 6 - 9
testdata/scripts/help.txt

@@ -92,25 +92,22 @@ stderr 'directory not found'
 # To avoid building another garble binary,
 # and to be able to use static VCS info, use an environment variable.
 # First, test without the information, and then with it.
-#
-# Note that Go 1.18.0 shipped with -buildvcs=true for "go test",
-# so it's a special case that we need to handle until 1.18.1 is out.
 garble version
 stdout -count=1 'mvdan.cc/garble \(devel\)'
 stdout -count=1 'Build settings'
 stdout -count=3 '-compiler|GOOS|GOARCH'
-[go1.19] ! stdout 'vcs'
+! stdout 'vcs'
 
 # Obtained from a real build while developing.
-env GARBLE_TEST_SETTINGS='[{"Key":"vcs","Value":"git"},{"Key":"vcs.revision","Value":"91ea246349544769f5100c29f79cb0f173abfeea"},{"Key":"vcs.time","Value":"2022-03-18T13:45:11Z"},{"Key":"vcs.modified","Value":"true"}]'
+env GARBLE_TEST_BUILDSETTINGS='[{"Key":"vcs","Value":"git"},{"Key":"vcs.revision","Value":"91ea246349544769f5100c29f79cb0f173abfeea"},{"Key":"vcs.time","Value":"2022-03-18T13:45:11Z"},{"Key":"vcs.modified","Value":"true"}]'
 garble version
 stdout -count=1 'mvdan\.cc/garble v0\.0\.0-20220318134511-91ea24634954'
 stdout -count=1 'Build settings'
 stdout -count=3 '-compiler|GOOS|GOARCH'
-[go1.19] stdout -count=1 'vcs git'
-[go1.19] stdout -count=1 'vcs\.revision 91ea246349544769f5100c29f79cb0f173abfeea'
-[go1.19] stdout -count=1 'vcs\.time 2022-03-18T13:45:11Z'
-[go1.19] stdout -count=1 'vcs\.modified true'
+stdout -count=1 'vcs git'
+stdout -count=1 'vcs\.revision 91ea246349544769f5100c29f79cb0f173abfeea'
+stdout -count=1 'vcs\.time 2022-03-18T13:45:11Z'
+stdout -count=1 'vcs\.modified true'
 
 ! garble version -flag
 stderr 'usage: garble version'