aboutsummaryrefslogtreecommitdiff
path: root/src/run.bash
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2013-08-07 13:49:37 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2013-08-07 13:49:37 -0700
commitd5e97ea2f51f145e041a86db9eb7bfbc3f1adb75 (patch)
treedb2c3708cce4f0e641c03644b091826a669800a9 /src/run.bash
parent326ae8d14e17227086239757ef2f131028997a72 (diff)
downloadgo-d5e97ea2f51f145e041a86db9eb7bfbc3f1adb75.tar.xz
build: change how cmd/api is run in run.bash and run.bat
In prep for Robert's forthcoming cmd/api rewrite which depends on the go.tools subrepo, we'll need to be more careful about how and when we run cmd/api. Rather than implement this policy in both run.bash and run.bat, this change moves the policy and mechanism into cmd/api/run.go, which will then evolve. The plan is in a TODO in run.go. R=golang-dev, gri CC=golang-dev https://golang.org/cl/12482044
Diffstat (limited to 'src/run.bash')
-rwxr-xr-xsrc/run.bash9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/run.bash b/src/run.bash
index ded465b668..178290327a 100755
--- a/src/run.bash
+++ b/src/run.bash
@@ -180,12 +180,9 @@ unset GOMAXPROCS
time go run run.go || exit 1
) || exit $?
-if [ -d "$GOROOT/src/cmd/api" ]
-then
- echo
- echo '# Checking API compatibility.'
- go tool api -c $GOROOT/api/go1.txt,$GOROOT/api/go1.1.txt -next $GOROOT/api/next.txt -except $GOROOT/api/except.txt
-fi
+echo
+echo '# Checking API compatibility.'
+go run --tags=from_src_run $GOROOT/src/cmd/api/run.go
echo
echo ALL TESTS PASSED