Merge pull request #688 from unihorn/57

fix test error
release-0.4
Yicheng Qin 2014-04-03 17:36:14 -07:00
commit bec7d7f614
2 changed files with 8 additions and 8 deletions

2
build
View File

@ -7,7 +7,7 @@ fi
export GOBIN=${PWD}/bin
export GOPATH=${PWD}
export GOFMTPATH="./bench ./config ./discovery ./error etcd.go ./http ./log ./machines ./metrics ./mod profile.go ./server ./store ./tests"
export GOFMTPATH="./bench ./config ./discovery ./etcd ./error ./http ./log ./machines main.go ./metrics ./mod ./server ./store ./tests"
# Don't surprise user by formatting their codes by stealth
if [ "$1" == "--fmt" ]; then

14
test.sh
View File

@ -2,13 +2,6 @@
. ./build
fmtRes=`gofmt -l $GOFMTPATH`
if [ "$fmtRes" != "" ]; then
echo "Failed to pass golang format checking."
echo "Please gofmt modified go files, or run './build --fmt'."
exit 1
fi
go test -i ./http
go test -v ./http
@ -32,3 +25,10 @@ go test -v ./mod/lock/v2/tests
go test -i ./tests/functional
ETCD_BIN_PATH=$(pwd)/bin/etcd go test -v ./tests/functional
fmtRes=`gofmt -l $GOFMTPATH`
if [ "$fmtRes" != "" ]; then
echo "Failed to pass golang format checking."
echo "Please gofmt modified go files, or run './build --fmt'."
exit 1
fi