diff options
| author | Russ Cox <rsc@golang.org> | 2014-12-04 23:43:01 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-12-04 23:43:01 -0500 |
| commit | 9c2f816aaf4dd3a3bc0f3ed2c31323ca2275d9bf (patch) | |
| tree | a35f708b819ce2f029c02fa296ded3ed13cb89aa | |
| parent | a8fd4a66e6e0e7f2134909695992fa2933d34369 (diff) | |
| download | go-9c2f816aaf4dd3a3bc0f3ed2c31323ca2275d9bf.tar.gz | |
[release-branch.go1.4] cmd/go: fix build
??? CL 182480043 / 8d42099cdc23
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://codereview.appspot.com/182480043
???
TBR=r
CC=golang-codereviews
https://codereview.appspot.com/178690043
| -rw-r--r-- | src/cmd/go/generate.go | 2 | ||||
| -rw-r--r-- | src/cmd/go/generate_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/go/generate.go b/src/cmd/go/generate.go index 88f7efa0f..baf4d2b55 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 93c0ae66e..660ebabbe 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) } |