diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-01-17 12:40:45 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-01-17 12:40:45 +0100 |
| commit | 3e45412327a2654a77944249962b3652e6142299 (patch) | |
| tree | bc3bf69452afa055423cbe0c5cfa8ca357df6ccf /test/garbage | |
| parent | c533680039762cacbc37db8dc7eed074c3e497be (diff) | |
| download | golang-3e45412327a2654a77944249962b3652e6142299.tar.gz | |
Imported Upstream version 2011.01.12upstream/2011.01.12
Diffstat (limited to 'test/garbage')
| -rw-r--r-- | test/garbage/Makefile | 2 | ||||
| -rw-r--r-- | test/garbage/parser.go | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/test/garbage/Makefile b/test/garbage/Makefile index 1a5062b44..ab29e0956 100644 --- a/test/garbage/Makefile +++ b/test/garbage/Makefile @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style # license that can be found in the LICENSE file. -include ../../src/Make.$(GOARCH) +include ../../src/Make.inc ALL=\ parser\ diff --git a/test/garbage/parser.go b/test/garbage/parser.go index e8e049474..cf68737fb 100644 --- a/test/garbage/parser.go +++ b/test/garbage/parser.go @@ -30,11 +30,11 @@ func isPkgFile(dir *os.FileInfo) bool { } func pkgName(filename string) string { - file, err := parser.ParseFile(filename, nil, nil, parser.PackageClauseOnly) + file, err := parser.ParseFile(filename, nil, parser.PackageClauseOnly) if err != nil || file == nil { return "" } - return file.Name.Name() + return file.Name.Name } func parseDir(dirpath string) map[string]*ast.Package { @@ -74,7 +74,7 @@ func main() { flag.Parse() var t0 int64 - pkgroot := os.Getenv("GOROOT") + "/src/pkg/" + pkgroot := runtime.GOROOT() + "/src/pkg/" for pass := 0; pass < 2; pass++ { // Once the heap is grown to full size, reset counters. // This hides the start-up pauses, which are much smaller @@ -115,7 +115,6 @@ var packages = []string{ "archive/tar", "asn1", "big", - "bignum", "bufio", "bytes", "cmath", @@ -185,7 +184,6 @@ var packages = []string{ "mime", "net", "nntp", - "once", "os", "os/signal", "patch", |