From: Russ Cox Date: Thu, 22 Jan 2009 23:41:12 +0000 (-0800) Subject: use $GC, $GL in gotest, to match gccgo's gotest. X-Git-Tag: weekly.2009-11-06~2311 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=8c5bc7e93adae7546b4f1520d1b20f18ebe95d88;p=gostls13.git use $GC, $GL in gotest, to match gccgo's gotest. use $GC in all_test.go for portability. R=r DELTA=19 (12 added, 0 deleted, 7 changed) OCL=23305 CL=23325 --- diff --git a/src/cmd/gotest/gotest b/src/cmd/gotest/gotest index d95201ad87..f292034cbd 100755 --- a/src/cmd/gotest/gotest +++ b/src/cmd/gotest/gotest @@ -8,6 +8,11 @@ # tests. # If files are named on the command line, use them instead of test*.go. +O=6 +GC=${GC:-${O}g} +GL=${GL:-${O}l} +export GC GL + gofiles="" loop=true while $loop; do @@ -27,20 +32,27 @@ done case "x$gofiles" in x) - gofiles=$(echo *test.go) + gofiles=$(ls *_test.go 2>/dev/null) +esac + +case "x$gofiles" in +x) + echo 'no test files found' 1>&2 + exit 1 esac ofiles=$(echo $gofiles | sed 's/\.go/.6/g') files=$(echo $gofiles | sed 's/\.go//g') + # Run any commands given in sources, like -# // gotest: 6g foo.go +# // gotest: $GC foo.go # to build any test-only dependencies. sed -n 's/^\/\/ gotest: //p' $gofiles | sh for i in $gofiles do - 6g $i + $GC $i done set -e @@ -84,6 +96,6 @@ trap "rm -f _testmain.go _testmain.6" 0 1 2 3 14 15 echo '}' }>_testmain.go -6g _testmain.go -6l _testmain.6 -./6.out "$@" +$GC _testmain.go +$GL _testmain.$O +./$O.out "$@"