From: Rob Pike <r@golang.org>
Date: Fri, 5 Dec 2014 00:37:56 +0000 (+0900)
Subject: cmd/go: fix build
X-Git-Tag: go1.5beta1~2689
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=41c6b84342b27353ed40aa3942ef8647631a322b;p=gostls13.git

cmd/go: fix build
The new semantics of split require the newline be present.
The test was stale.

LGTM=adg
R=golang-codereviews, adg
CC=golang-codereviews
https://golang.org/cl/182480043
---

diff --git a/src/cmd/go/generate.go b/src/cmd/go/generate.go
index 88f7efa0f3..baf4d2b55c 100644
--- a/src/cmd/go/generate.go
+++ b/src/cmd/go/generate.go
@@ -250,7 +250,7 @@ func isGoGenerate(buf []byte) bool {
 
 // split breaks the line into words, evaluating quoted
 // strings and evaluating environment variables.
-// The initial //go:generate element is dropped.
+// The initial //go:generate element is present in line.
 func (g *Generator) split(line string) []string {
 	// Parse line, obeying quoted strings.
 	var words []string
diff --git a/src/cmd/go/generate_test.go b/src/cmd/go/generate_test.go
index 93c0ae66e9..660ebabbe8 100644
--- a/src/cmd/go/generate_test.go
+++ b/src/cmd/go/generate_test.go
@@ -40,7 +40,7 @@ func TestGenerateCommandParse(t *testing.T) {
 	}
 	g.setShorthand([]string{"-command", "yacc", "go", "tool", "yacc"})
 	for _, test := range splitTests {
-		got := g.split("//go:generate " + test.in)
+		got := g.split("//go:generate " + test.in + "\n")
 		if !reflect.DeepEqual(got, test.out) {
 			t.Errorf("split(%q): got %q expected %q", test.in, got, test.out)
 		}