]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go/testdata/script: fix TestScript/env_gocacheprog on Windows
authorMichael Matloob <matloob@golang.org>
Wed, 8 Jan 2025 16:19:05 +0000 (11:19 -0500)
committerMichael Matloob <matloob@golang.org>
Wed, 8 Jan 2025 18:11:09 +0000 (10:11 -0800)
The backslashes on the windows paths will be escaped, so when checking
for them in the regular expression we'd have to have quadruple
backslashes '\\\\'. Since it's difficult to escape $GOCACHEPROG properly
for both json and regexp, just check for a string that ends in
cacheprog$GOEXE. We already check that the proper value is reported in
go env and go env -changed, and the json test case is mostly useful to
verify that GOCACHEPROG shows up in the json output.

For #71059

Change-Id: I52d49de61f2309a139f84c4d232b4cd94546ec8c
Cq-Include-Trybots: luci.golang.try:gotip-windows-amd64-longtest,gotip-linux-amd64-longtest
Reviewed-on: https://go-review.googlesource.com/c/go/+/641375
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Sam Thanawalla <samthanawalla@google.com>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
src/cmd/go/testdata/script/env_gocacheprog.txt

index f5f15ed0784fda72b2e05ff7668565c735a9bd4d..1547bf058c16ca3b203bed44f1e6f6c8cf8badd9 100644 (file)
@@ -24,7 +24,7 @@ go env -changed
 stdout 'GOCACHEPROG=''?'$GOCACHEPROG'''?'
 
 go env -changed -json
-stdout '"GOCACHEPROG": "'$GOCACHEPROG'"'
+stdout '"GOCACHEPROG": ".*cacheprog'$GOEXE'"'
 
 -- cacheprog.go --
 // This is a minimal GOCACHEPROG program that can't actually do anything but exit.