godoc: don't show testdata directories

R=golang-dev, bradfitz, dsymonds, minux.ma, rsc
CC=golang-dev
https://golang.org/cl/5700043

diff --git a/src/cmd/godoc/dirtrees.go b/src/cmd/godoc/dirtrees.go
index b395f6014beaaac822f44087cb48e9b239068cc4..703c46272f4c495369f34ea7defe34f1f9018945 100644 (file)
--- a/src/cmd/godoc/dirtrees.go
+++ b/src/cmd/godoc/dirtrees.go
@@ -17,6 +17,11 @@ import (
        "strings"
 )
 
+// Conventional name for directories containing test data.
+// Excluded from directory trees.
+//
+const testdataDirName = "testdata"
+
 type Directory struct {
        Depth int
        Path  string // includes Name
@@ -49,7 +54,7 @@ type treeBuilder struct {
 }
 
 func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth int) *Directory {
-       if b.pathFilter != nil && !b.pathFilter(path) {
+       if b.pathFilter != nil && !b.pathFilter(path) || name == testdataDirName {
                return nil
        }