close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

godoc: test fixes for recent cmdline changes. 

Tests broken by:
https://code.google.com/p/go/source/detail?r=1666da2583f4&repo=tools

R=gri, adonovan
CC=golang-codereviews
https://golang.org/cl/58780043
This commit is contained in:
Brad Garcia 2014-01-30 15:32:23 -05:00
parent 9cd9226d63
commit d682175c6e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/godoc/godoc_test.go
View File

@ -28,8 +28,8 @@ var godocTests = []struct {
{ {
[]string{"io", "WriteString"}, []string{"io", "WriteString"},
[]string{ []string{
`import "io"`,
`func WriteString\(`, `func WriteString\(`,
`WriteString writes the contents of the string s to w`,
}, },
}, },
} }

4
godoc/cmdline_test.go
View File

@ -183,8 +183,8 @@ package main
p.cmdHandler = handlerServer{p, c, "/cmd/", "/src/cmd"} p.cmdHandler = handlerServer{p, c, "/cmd/", "/src/cmd"}
p.pkgHandler = handlerServer{p, c, "/pkg/", "/src/pkg"} p.pkgHandler = handlerServer{p, c, "/pkg/", "/src/pkg"}
p.initFuncMap() p.initFuncMap()
p.PackageText = template.Must(template.New("PackageText").Funcs(p.FuncMap()).Parse(`{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}: p.PackageText = template.Must(template.New("PackageText").Funcs(p.FuncMap()).Parse(`{{$info := .}}{{$filtered := .IsFiltered}}{{if $filtered}}{{range .PAst}}{{range .Decls}}{{node $info .}}{{end}}{{end}}{{else}}{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}:
{{node $ $ast}}{{end}}{{end}}{{with .PDoc}}{{if $.IsMain}}COMMAND {{.Doc}}{{else}}PACKAGE {{.Doc}}{{end}}{{with .Funcs}} {{node $ $ast}}{{end}}{{end}}{{end}}{{with .PDoc}}{{if $.IsMain}}COMMAND {{.Doc}}{{else}}PACKAGE {{.Doc}}{{end}}{{with .Funcs}}
{{range .}}{{node $ .Decl}} {{range .}}{{node $ .Decl}}
{{comment_text .Doc " " "\t"}}{{end}}{{end}}{{end}}`)) {{comment_text .Doc " " "\t"}}{{end}}{{end}}{{end}}`))