summaryrefslogtreecommitdiff
path: root/src
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
commit3ebebda3a7495402239db4369d59d73749c1bfa2 (patch)
tree4e7f43e0aa61c824eafd821ccd161fc64290e25a /src
parent5223a2c9fbc6a2633a77586dbfec379e584c779e (diff)
downloadgo-3ebebda3a7495402239db4369d59d73749c1bfa2.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://codereview.appspot.com/182480043
Diffstat (limited to 'src')
-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 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)
}