diff --git a/.travis.yml b/.travis.yml index e056946a2..f124f408d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ env: - TEST_TYPE=integration ETCD_VERSION=3.3.8 - TEST_TYPE=core ETCD_VERSION=3.3.8 - TEST_TYPE=plugin ETCD_VERSION=3.3.8 - - TEST_TYPE=benchmark ETCD_VERSION=3.3.8 # In the Travis VM-based build environment, IPv6 networking is not # enabled by default. The sysctl operations below enable IPv6. diff --git a/Makefile b/Makefile index 5efbaf8c8..7f7951147 100644 --- a/Makefile +++ b/Makefile @@ -33,8 +33,6 @@ godeps: (cd $(GOPATH)/src/github.com/mholt/caddy && git checkout -q v0.11.1) (cd $(GOPATH)/src/github.com/miekg/dns && git checkout -q v1.1.0) (cd $(GOPATH)/src/github.com/prometheus/client_golang && git checkout -q v0.8.0) - @ # for travis only, if this fails we don't care, but don't see benchmarks - go get -u golang.org/x/tools/cmd/benchcmp || true .PHONY: travis travis: @@ -61,21 +59,6 @@ ifeq ($(TEST_TYPE),coverage) fi; \ done endif -ifeq ($(TEST_TYPE),benchmark) - > new - ( cd plugin; go test -run=NONE -bench=. -benchmem=true -tags 'etcd' ./... ) >> new - ( cd request; go test -run=NONE -bench=. -benchmem=true -tags 'etcd' ./... ) >> new - ( cd core; go test -run=NONE -bench=. -benchmem=true -tags 'etcd' ./... ) >> new - ( cd coremain; go test -run=NONE -bench=. -benchmem=true -tags 'etcd' ./... ) >> new - git checkout master - > old - ( cd plugin; go test -run=NONE -bench=. -benchmem=true -tags 'etcd' ./... ) >> old - ( cd request; go test -run=NONE -bench=. -benchmem=true -tags 'etcd' ./... ) >> old - ( cd core; go test -run=NONE -bench=. -benchmem=true -tags 'etcd' ./... ) >> old - ( cd coremain; go test -run=NONE -bench=. -benchmem=true -tags 'etcd' ./... ) >> old - if command -v benchcmp; then benchcmp old new > .benchmark.log ; cat .benchmark.log ; fi - git checkout - -endif core/zplugin.go core/dnsserver/zdirectives.go: plugin.cfg go generate coredns.go