Merge 53f2039 into 9a541e4

.travis.yml

@@ -1,12 +1,13 @@
 language: go
 
 sudo: required
-dist: trusty
+dist: xenial
+
+env:
+  - GO111MODULE=on
 
 go:
-  - 1.7
-  - 1.8
-  - 1.9
+  - 1.x
   - master
   - tip
 
@@ -16,16 +17,11 @@ matrix:
     - go: master
     - go: tip
 
-cache: apt
-
 install:
-  - go get golang.org/x/tools/cmd/cover
-  - go get github.com/mattn/goveralls
-  - go get github.com/stretchr/testify/assert
+  - go get github.com/mattn/goveralls@master
 
 script:
-  - make travis
-  - goveralls -service=travis-ci
+  - goveralls -v -race -covermode=atomic -service=travis-ci
 
 #deploy:
 #  on:

Makefile

@@ -1,26 +1,24 @@
-.PHONY: all clean test cover bench
-
-PACKAGES = $(shell go list ./... | grep -v vendor)
-
+.PHONY: all
 all: test
 
+.PHONY: clean
 clean:
 	@go clean -i ./...
 
+.PHONY: test
 test:
-	@for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
+	@go test -cover -coverprofile ./coverage.out ./...
 
+.PHONY: travis
 travis:
-	@for PKG in $(PACKAGES); do go test -ldflags '-s -w $(LDFLAGS)' -cover -covermode=count -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
+	@go test -race -cover -covermode=atomic -coverprofile ./coverage.out ./...
 
+.PHONY: cover
 cover: test
 	@echo ""
-	@mkdir -p coverage/
-	@echo "mode: set" > ./coverage/test.cov
-	@for PKG in $(PACKAGES); do if [ -f $$GOPATH/src/$$PKG/coverage.out ]; then tail -q -n +2 $$GOPATH/src/$$PKG/coverage.out >> ./coverage/test.cov; fi; done;
-	@go tool cover -func ./coverage/test.cov
-	#@go tool cover -html=./coverage/test.cov
+	@go tool cover -func ./coverage.out
 
+.PHONY: bench
 bench:
-	@for PKG in $(PACKAGES); do go test -benchmem -bench=. $$PKG || exit 1; done;
+	@go test -benchmem -bench=. ./...