From: Russ Cox <rsc@golang.org>
Date: Wed, 7 Oct 2009 21:52:44 +0000 (-0700)
Subject: do not import testing twice when testing testing.
X-Git-Tag: weekly.2009-11-06~378
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4fd7a908bb5f904181cf7aaf3bcf6155c6ba5c8c;p=gostls13.git

do not import testing twice when testing testing.

R=r
DELTA=3  (2 added, 0 deleted, 1 changed)
OCL=35443
CL=35445
---

diff --git a/src/cmd/gotest/gotest b/src/cmd/gotest/gotest
index c4c8e1a9e0..212abbf755 100755
--- a/src/cmd/gotest/gotest
+++ b/src/cmd/gotest/gotest
@@ -107,7 +107,9 @@ importpath=$(make -s importpath)
 	echo
 	# imports
 	if echo "$tests" | egrep -v '_test\.' >/dev/null; then
-		echo 'import "'$importpath'"'
+		if [ "$importpath" != "testing" ]; then
+			echo 'import "'$importpath'"'
+		fi
 	fi
 	if $havex; then
 		echo 'import "./_xtest_"'