From: Robert Griesemer <gri@golang.org>
Date: Wed, 13 Apr 2011 21:24:38 +0000 (-0700)
Subject: fix build: disable gofmt test script, enable gotest testing instead
X-Git-Tag: weekly.2011-04-13~10
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5666ec87353178e0124b6263ed3c87d799557fcb;p=gostls13.git

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 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;