fix build: disable gofmt test script, enable gotest testing instead

R=rsc
CC=golang-dev
https://golang.org/cl/4403045

diff --git a/src/cmd/gofmt/Makefile b/src/cmd/gofmt/Makefile
index 5f2f454e82255e6b4ea3fb18edb6cb228f5e40ab..dc5b060e654039aed67d047a261702378c1cf29d 100644 (file)
--- 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 2e6e092b0bf89911514a8c1b9ea907a7f39cca8c..e45b39e86a84ce3d89c340ecafe1afc2c6d46722 100644 (file)
--- 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 91cd3cc997e2e689a1abb9c4cbd352c0a190d40c..ea98403f73a6f3320caa3a3d9d24b376d119bf92 100755 (executable)
--- 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;