Merge branch 'master' of github.com:src-d/go-git

Author: mcuadros

.travis.yml

@@ -3,6 +3,7 @@ language: go
 go:
   - 1.4
   - 1.5
+  - tip
 
 install:
   - rm -rf $GOPATH/src/gopkg.in/src-d
@@ -11,18 +12,7 @@ install:
   - go get -v -t ./...
 
 script:
-  - go test -v ./...
-
-script:
-  - go test -v gopkg.in/src-d/go-git.v2 -covermode=count -coverprofile=coverage.out
-  - go test -v gopkg.in/src-d/go-git.v2/clients/common -covermode=count -coverprofile=tmp.out
-  - tail -n +2 tmp.out >> coverage.out
-  - go test -v gopkg.in/src-d/go-git.v2/clients/http -covermode=count -coverprofile=tmp.out
-  - tail -n +2 tmp.out >> coverage.out
-  - go test -v gopkg.in/src-d/go-git.v2/formats/packfile -covermode=count -coverprofile=tmp.out
-  - tail -n +2 tmp.out >> coverage.out
-  - go test -v gopkg.in/src-d/go-git.v2/formats/pktline -covermode=count -coverprofile=tmp.out
-  - tail -n +2 tmp.out >> coverage.out
+  - make test-coverage
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

Makefile

@@ -0,0 +1,36 @@
+# Default shell
+SHELL := /bin/bash
+
+# General
+WORKDIR = $(PWD)
+
+# Go parameters
+GOCMD = go
+GOTEST = $(GOCMD) test -v
+
+# Coverage
+COVERAGE_REPORT = coverage.txt
+COVERAGE_PROFILE = profile.out
+COVERAGE_MODE = atomic
+
+ifneq ($(origin CI), undefined)
+	WORKDIR := $(TRAVIS_BUILD_DIR)
+endif
+
+
+test:
+	$(GOTEST) ./...
+
+test-coverage:
+	cd $(WORKDIR); \
+	echo "" > $(COVERAGE_REPORT); \
+	for dir in `find . -name "*.go" | grep -o '.*/' | sort | uniq`; do \
+		$(GOTEST) $$dir -coverprofile=$(COVERAGE_PROFILE) -covermode=$(COVERAGE_MODE); \
+		if [ $$? != 0 ]; then \
+			exit 2; \
+		fi; \
+		if [ -f $(COVERAGE_PROFILE) ]; then \
+			cat $(COVERAGE_PROFILE) >> $(COVERAGE_REPORT); \
+			rm $(COVERAGE_PROFILE); \
+		fi; \
+	done; \