diff options
| author | Robert Griesemer <gri@golang.org> | 2011-04-13 14:24:38 -0700 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2011-04-13 14:24:38 -0700 |
| commit | 5666ec87353178e0124b6263ed3c87d799557fcb (patch) | |
| tree | 6f38f26d20bae05b1e425c26332b9304ba02967e | |
| parent | c7d16cc4118bf0db3e4268a7ab657577911999f4 (diff) | |
| download | go-5666ec87353178e0124b6263ed3c87d799557fcb.tar.gz go-5666ec87353178e0124b6263ed3c87d799557fcb.zip | |
fix build: disable gofmt test script, enable gotest testing instead
R=rsc
CC=golang-dev
https://golang.org/cl/4403045
| -rw-r--r-- | src/cmd/gofmt/Makefile | 4 | ||||
| -rw-r--r-- | src/pkg/Makefile | 1 | ||||
| -rwxr-xr-x | src/run.bash | 9 |
3 files changed, 2 insertions, 12 deletions
diff --git a/src/cmd/gofmt/Makefile b/src/cmd/gofmt/Makefile index 5f2f454e82..dc5b060e65 100644 --- a/src/cmd/gofmt/Makefile +++ b/src/cmd/gofmt/Makefile @@ -15,5 +15,5 @@ include ../../Make.cmd test: $(TARG) ./test.sh -smoketest: $(TARG) - (cd testdata; ./test.sh) +testshort: + gotest -test.short diff --git a/src/pkg/Makefile b/src/pkg/Makefile index 2e6e092b0b..e45b39e86a 100644 --- a/src/pkg/Makefile +++ b/src/pkg/Makefile @@ -194,7 +194,6 @@ NOTEST+=\ ../cmd/cgo\ ../cmd/ebnflint\ ../cmd/godoc\ - ../cmd/gofmt\ ../cmd/gotest\ ../cmd/govet\ ../cmd/goyacc\ diff --git a/src/run.bash b/src/run.bash index 91cd3cc997..ea98403f73 100755 --- a/src/run.bash +++ b/src/run.bash @@ -50,15 +50,6 @@ fi GOMAXPROCS=10 gomake testshort ) || exit $? -[ "$GOARCH" == arm ] || -(xcd cmd/gofmt -if $rebuild; then - gomake clean; - time gomake -fi -time gomake smoketest -) || exit $? - (xcd cmd/ebnflint if $rebuild; then gomake clean; |