From 66d41569837e7319adbf217ceef43203109ce3f1 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Sat, 12 Jun 2010 10:47:42 -0700
Subject: gopack: add S flag to force marking a package as safe

R=r
CC=golang-dev
http://codereview.appspot.com/1597044
---
 src/cmd/gotest/gotest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/cmd/gotest')

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)
-- 
cgit v1.2.3