Skip to content

Commit

Permalink
cmd/go: fix syntax mistake in a testscript file, take 2
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
  • Loading branch information
dmitshur committed Jun 9, 2019
1 parent 13f179b commit 323212b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cmd/go/testdata/script/env_write.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 323212b

Please sign in to comment.