Merge pull request #43 from mackerelio/go1.5

build with go1.5

Author: Songmu

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-- 1.4
+- 1.5
 env:
   - PATH=/home/travis/gopath/bin:$PATH DEBIAN_FRONTEND=noninteractive
 sudo: false
@@ -12,7 +12,6 @@ addons:
       - debhelper
 install:
 - go get github.com/mitchellh/gox
-- gox -build-toolchain -osarch=linux/386
 - mkdir -p ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 script:
 - make lint

Makefile

@@ -11,7 +11,7 @@ deps:
 devel-deps: deps
 	go get github.com/golang/lint/golint
 	go get golang.org/x/tools/cmd/vet
-	go get golang.org/x/tools/cmd/cover
+	go get github.com/pierrre/gotestcover
 	go get github.com/mattn/goveralls
 
 LINT_RET = .golint.txt
@@ -22,7 +22,7 @@ lint: devel-deps
 	test ! -s $(LINT_RET)
 
 cover: devel-deps
-	tool/cover.sh
+	gotestcover -v -short -covermode=count -coverprofile=.profile.cov -parallelpackages=4 ./...
 
 build: deps
 	mkdir -p build