From: Bryan C. Mills <bcmills@google.com>
Date: Fri, 14 Jan 2022 16:15:28 +0000 (-0500)
Subject: cmd/go: fix TestScript/version_buildvcs_git_gpg
X-Git-Tag: go1.18beta2~75
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2a061fdd47ccb5420229ce5f9f057e194be76995;p=gostls13.git

cmd/go: fix TestScript/version_buildvcs_git_gpg

This test was missed in CL 358539, presumably because the 'longtest'
builders lack a 'gpg' executable.

Updates #49168
Fixes #50675

Change-Id: Ie3bfc761a5e4304531119625742f3def9df8af3f
Reviewed-on: https://go-review.googlesource.com/c/go/+/378575
Trust: Bryan Mills <bcmills@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/cmd/go/testdata/script/version_buildvcs_git_gpg.txt b/src/cmd/go/testdata/script/version_buildvcs_git_gpg.txt
index 6d429c5a52..dcf97d7c44 100644
--- a/src/cmd/go/testdata/script/version_buildvcs_git_gpg.txt
+++ b/src/cmd/go/testdata/script/version_buildvcs_git_gpg.txt
@@ -34,9 +34,9 @@ exec git log
 # Verify commit signature does not interfere with versioning
 go install
 go version -m $GOBIN/a
-stdout '^\tbuild\tgitrevision\t'
-stdout '^\tbuild\tgitcommittime\t'
-stdout '^\tbuild\tgituncommitted\tfalse$'
+stdout '^\tbuild\tvcs\.revision='
+stdout '^\tbuild\tvcs\.time='
+stdout '^\tbuild\tvcs\.modified=false$'
 
 -- repo/README --
 Far out in the uncharted backwaters of the unfashionable end of the western