diff --git a/tidb/tidb.patch b/tidb/tidb.patch index e13b7a9060..b0c5c1f90d 100644 --- a/tidb/tidb.patch +++ b/tidb/tidb.patch @@ -1,6 +1,6 @@ Index: src/github.com/pingcap/tidb/Makefile ---- src/github.com/pingcap/tidb/Makefile.orig 2016-09-03 14:59:11.000000000 +0200 -+++ src/github.com/pingcap/tidb/Makefile 2016-09-03 15:19:13.779467534 +0200 +--- src/github.com/pingcap/tidb/Makefile.orig 2016-09-16 23:28:11.000000000 +0200 ++++ src/github.com/pingcap/tidb/Makefile 2016-09-16 23:34:14.440418945 +0200 @@ -16,7 +16,7 @@ FILES := $$(find . -name '*.go' | grep -vE 'vendor') @@ -31,7 +31,7 @@ Index: src/github.com/pingcap/tidb/Makefile - @echo "vet --shadow" - @ go tool vet --shadow $(FILES) 2>&1 | awk '{print} END{if(NR>0) {exit 1}}' - @echo "golint" -- @ golint $(PACKGES) 2>&1 | grep -vE 'LastInsertId|NewLexer|\.pb\.go' | awk '{print} END{if(NR>0) {exit 1}}' +- @ golint ./... 2>&1 | grep -vE 'LastInsertId|NewLexer|\.pb\.go' | awk '{print} END{if(NR>0) {exit 1}}' - @echo "gofmt (simplify)" - @ gofmt -s -l -w $(FILES) 2>&1 | awk '{print} END{if(NR>0) {exit 1}}' @@ -40,17 +40,24 @@ Index: src/github.com/pingcap/tidb/Makefile errcheck -blank $(PACKAGES) clean: -@@ -96,19 +84,10 @@ +@@ -96,26 +84,10 @@ test: gotest gotest: - rm -rf vendor && ln -s _vendor/vendor vendor +- @export log_level=error;\ - $(GO) test -cover $(PACKAGES) - rm -rf vendor race: - rm -rf vendor && ln -s _vendor/vendor vendor -- $(GO) test --race $(PACKAGES) +- @export log_level=debug; \ +- dirs=`go list ./... | grep -vE 'vendor' | awk '{sub("github.com/pingcap/tidb/",""); print}'`;\ +- for dir in $$dirs; do \ +- cd $$dir;\ +- go test -race | awk 'END{if($$1=="FAIL") {exit 1}}' || exit 1;\ +- cd -;\ +- done; - rm -rf vendor tikv_integration_test: @@ -60,7 +67,7 @@ Index: src/github.com/pingcap/tidb/Makefile interpreter: rm -rf vendor && ln -s _vendor/vendor vendor -@@ -118,11 +97,11 @@ +@@ -125,11 +97,11 @@ server: parser ifeq ($(TARGET), "") rm -rf vendor && ln -s _vendor/vendor vendor diff --git a/tidb/tidb.spec b/tidb/tidb.spec index c7267db2e8..d5fd567183 100644 --- a/tidb/tidb.spec +++ b/tidb/tidb.spec @@ -24,7 +24,7 @@ # package information %define V_tidb_opkg 0.5a %define V_tidb_base 0.5-alpha -%define V_tidb_snap 20160903 +%define V_tidb_snap 20160916 # package information Name: tidb @@ -37,7 +37,7 @@ Class: EVAL Group: Database License: Apache Version: %{V_tidb_opkg} -Release: 20160903 +Release: 20160916 # list of sources Source0: http://download.openpkg.org/components/versioned/tidb/tidb-%{V_tidb_snap}.tar.xz