Merge branch 'master' into more-charset-tests

go/binlog/binlog_reader.go

@@ -5,8 +5,6 @@
 
 package binlog
 
-import ()
-
 // BinlogReader is a general interface whose implementations can choose their methods of reading
 // a binary log file and parsing it into binlog entries
 type BinlogReader interface {

go/binlog/gomysql_reader.go

@@ -17,8 +17,6 @@ import (
 	"github.com/siddontang/go-mysql/replication"
 )
 
-var ()
-
 const (
 	serverId = 99999
 )

script/cibuild

@@ -4,9 +4,14 @@ set -e
 
 . script/bootstrap
 
+echo "Verifying code is formatted via 'gofmt -s -w  go/'"
+gofmt -s -w  go/
+git diff --exit-code --quiet
+
+echo "Building"
 script/build
 
-export GITBACKUPS_ENV=test
-
 cd .gopath/src/github.com/github/gh-ost
+
+echo "Running unit tests"
 go test ./go/...