cmd/go: don't let script grep commands match $WORK

ianlancetaylor · ianlancetaylor · commit f2ed3e1da16b · 2018-08-25T18:36:22.000Z
If $WORK happens to contain the string that a stdout/stderr/grep command is searching for, a negative grep command will fail incorrectly. Fixes golang#27170 Fixes golang#27221 Change-Id: I84454d3c42360fe3295c7235d388381525eb85b4 Reviewed-on: https://go-review.googlesource.com/131398 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Bryan C. Mills <bcmills@google.com>
diff --git a/src/cmd/go/script_test.go b/src/cmd/go/script_test.go
@@ -629,6 +629,9 @@ func scriptMatch(ts *testScript, neg bool, args []string, text, name string) {
 		text = string(data)
 	}
 
+	// Matching against workdir would be misleading.
+	text = strings.Replace(text, ts.workdir, "$WORK", -1)
+
 	if neg {
 		if re.MatchString(text) {
 			if isGrep {

Original file line number	Diff line number	Diff line change
`@@ -629,6 +629,9 @@ func scriptMatch(ts *testScript, neg bool, args []string, text, name string) {`
`629`	`629`	`text = string(data)`
`630`	`630`	`}`
`631`	`631`
	`632`	`+ // Matching against workdir would be misleading.`
	`633`	`+ text = strings.Replace(text, ts.workdir, "$WORK", -1)`
	`634`	`+`
`632`	`635`	`if neg {`
`633`	`636`	`if re.MatchString(text) {`
`634`	`637`	`if isGrep {`