diff options
| -rw-r--r-- | .travis.yml | 11 | ||||
| -rw-r--r-- | Makefile | 14 | ||||
| -rw-r--r-- | plugin/etcd/setup_test.go | 3 |
3 files changed, 13 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index f4557de7a..f40cc09e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,10 @@ branches: - master env: - - TEST_TYPE=coverage ETCD_VERSION=3.3.8 - - 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=coverage + - TEST_TYPE=integration + - TEST_TYPE=core + - TEST_TYPE=plugin # In the Travis VM-based build environment, IPv6 networking is not # enabled by default. The sysctl operations below enable IPv6. @@ -40,9 +40,6 @@ before_install: - cat /proc/net/if_inet6 - env -before_script: - - docker run -d --net=host --name=etcd quay.io/coreos/etcd:v$ETCD_VERSION - script: - make TEST_TYPE=$TEST_TYPE travis @@ -22,21 +22,21 @@ check: presubmit core/plugin/zplugin.go core/dnsserver/zdirectives.go .PHONY: travis travis: ifeq ($(TEST_TYPE),core) - ( cd request ; GO111MODULE=on go test -v -tags 'etcd' -race ./... ) - ( cd core ; GO111MODULE=on go test -v -tags 'etcd' -race ./... ) - ( cd coremain ; GO111MODULE=on go test -v -tags 'etcd' -race ./... ) + ( cd request ; GO111MODULE=on go test -v -race ./... ) + ( cd core ; GO111MODULE=on go test -v -race ./... ) + ( cd coremain ; GO111MODULE=on go test -v -race ./... ) endif ifeq ($(TEST_TYPE),integration) - ( cd test ; GO111MODULE=on go test -v -tags 'etcd' -race ./... ) + ( cd test ; GO111MODULE=on go test -v -race ./... ) endif ifeq ($(TEST_TYPE),plugin) - ( cd plugin ; GO111MODULE=on go test -v -tags 'etcd' -race ./... ) + ( cd plugin ; GO111MODULE=on go test -v -race ./... ) endif ifeq ($(TEST_TYPE),coverage) for d in `go list ./... | grep -v vendor`; do \ t=$$(date +%s); \ - GO111MODULE=on go test -i -tags 'etcd' -coverprofile=cover.out -covermode=atomic $$d || exit 1; \ - GO111MODULE=on go test -v -tags 'etcd' -coverprofile=cover.out -covermode=atomic $$d || exit 1; \ + GO111MODULE=on go test -i -coverprofile=cover.out -covermode=atomic $$d || exit 1; \ + GO111MODULE=on go test -v -coverprofile=cover.out -covermode=atomic $$d || exit 1; \ echo "Coverage test $$d took $$(($$(date +%s)-t)) seconds"; \ if [ -f cover.out ]; then \ cat cover.out >> coverage.txt; \ diff --git a/plugin/etcd/setup_test.go b/plugin/etcd/setup_test.go index 29018d623..19889f3bd 100644 --- a/plugin/etcd/setup_test.go +++ b/plugin/etcd/setup_test.go @@ -1,3 +1,5 @@ +// +build etcd + package etcd import ( @@ -126,6 +128,5 @@ func TestSetupEtcd(t *testing.T) { } } } - } } |