summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pike <r@golang.org>2014-12-05 09:37:56 +0900
committerRob Pike <r@golang.org>2014-12-05 09:37:56 +0900
commit41c6b84342b27353ed40aa3942ef8647631a322b (patch)
tree0b1db719c2264c9aff2bf615c1b2f2da590b1fba
parentdd26fc3822e474112e388f51d59a7257361fb72f (diff)
downloadgo-git-41c6b84342b27353ed40aa3942ef8647631a322b.tar.gz
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
-rw-r--r--src/cmd/go/generate.go2
-rw-r--r--src/cmd/go/generate_test.go2
2 files changed, 2 insertions, 2 deletions
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)
}