Do not test everything 2 times

Author: moul

.travis.yml

@@ -27,13 +27,8 @@ before_install:
   - go get golang.org/x/tools/cmd/cover
 
 
-install:
-  - make travis_install
-
-
 script:
   - make build
   - ./scw version
-  - make travis_run
   - make cover
   - goveralls -service=travis-ci -v -coverprofile=profile.out

Makefile

@@ -77,7 +77,7 @@ $(IREF_LIST): %_iref: pkg/scwversion/version.go
 $(TEST_LIST): %_test:
 	$(GOTEST) ./$*
 $(COVER_LIST): %_cover:
-	$(GOTEST) -coverprofile=file-profile.out ./$*
+	$(GOTEST) -covermode=count -v -coverprofile=file-profile.out ./$*
 	if [ -f file-profile.out ]; then cat file-profile.out | grep -v "mode: set" >> profile.out || true; rm -f file-profile.out; fi
 $(FMT_LIST): %_fmt:
 	$(GOFMT) ./$*
@@ -130,15 +130,6 @@ packages:
 #publish_packages:
 #	docker run -v $(PWD)/dist moul/dput ppa:moul/scw dist/scw_$(FPM_VERSION)_arm.changes
 
-
-travis_install:
-	go get golang.org/x/tools/cmd/cover
-
-
-travis_run: build
-	go test -v -covermode=count $(foreach int, $(SRC) $(PACKAGES), ./$(int))
-
-
 golint:
 	@go get github.com/golang/lint/golint
 	@for dir in */; do golint $$dir; done