diff options
| author | Russ Cox <rsc@golang.org> | 2010-06-12 10:47:42 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-06-12 10:47:42 -0700 |
| commit | 66d41569837e7319adbf217ceef43203109ce3f1 (patch) | |
| tree | 93dd47e7e0cf613fd8cabcb0e5908d3b9399814b /src/cmd/gotest | |
| parent | 4321eeca8945da697391dc4fb309a820e1b753cb (diff) | |
| download | golang-66d41569837e7319adbf217ceef43203109ce3f1.tar.gz | |
gopack: add S flag to force marking a package as safe
R=r
CC=golang-dev
http://codereview.appspot.com/1597044
Diffstat (limited to 'src/cmd/gotest')
| -rwxr-xr-x | src/cmd/gotest/gotest | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/gotest/gotest b/src/cmd/gotest/gotest index 0a0aafc34..b9626815a 100755 --- a/src/cmd/gotest/gotest +++ b/src/cmd/gotest/gotest @@ -100,7 +100,7 @@ if $havex; then fi # They all compile; now generate the code to call them. -trap "rm -f _testmain.go _testmain.$O" 0 1 2 3 14 15 +# trap "rm -f _testmain.go _testmain.$O" 0 1 2 3 14 15 # Suppress output to stdout on Linux MAKEFLAGS= @@ -116,7 +116,7 @@ nmgrep() { # Figure out pkg. case "$i" in *.a) - pkg=$("$GOBIN"/gopack p $i __.PKGDEF | sed -n 's/^package //p' | sed 1q) + pkg=$("$GOBIN"/gopack p $i __.PKGDEF | sed -n 's/^package //p' | sed 's/ .*//' | sed 1q) ;; *) pkg=$(sed -n 's/^ .* in package "\(.*\)".*/\1/p' $i | sed 1q) |