]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/go: fix syntax mistake in a testscript file, take 2
authorDmitri Shuralyov <dmitshur@golang.org>
Sun, 9 Jun 2019 16:04:23 +0000 (12:04 -0400)
committerDmitri Shuralyov <dmitshur@golang.org>
Sun, 9 Jun 2019 16:23:11 +0000 (16:23 +0000)
This is a followup to CL 181278 and CL 181177.

According to cmd/go/testdata/script/README:

Each line is parsed into a sequence of space-separated command words,
with environment variable expansion and # marking an end-of-line comment.
Adding single quotes around text keeps spaces in that text from being treated
as word separators and also disables environment variable expansion.

We want $HOME to be expanded, so leave it out of the single-quoted
block of text.

I tested this change on macOS, and it makes TestScript/env_write pass.

Fixes #32503

Change-Id: I13621aec82263e5cb6978c13a1ad71d2210a0e42
Reviewed-on: https://go-review.googlesource.com/c/go/+/181418
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/cmd/go/testdata/script/env_write.txt

index ea15087c5d3ea71117557cd38515ff23d2889439..695cc83f3d7f9b027880028690106ea6349e3d91 100644 (file)
@@ -5,7 +5,7 @@ env AppData=$HOME/windowsappdata
 env home=$HOME/plan9home
 go env GOENV
 [aix] stdout $HOME/.config/go/env
-[darwin] stdout '$HOME/Library/Application Support/go/env'
+[darwin] stdout $HOME'/Library/Application Support/go/env'
 [freebsd] stdout $HOME/.config/go/env
 [linux] stdout $HOME/.config/go/env
 [netbsd] stdout $HOME/.config/go/env