aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2016-02-11 12:10:12 +0100
committerMáximo Cuadros <mcuadros@gmail.com>2016-02-11 12:10:12 +0100
commitd3a39f2797d817a402ffdd8d1e321bf9c5700647 (patch)
treea46b569ae540f2021d8090d54325d3b71ee2df6e
parentd0155564148550167e756e440b5f9ce71c76abb3 (diff)
parent1cad23e71e4db887700ef6d192ade463904261fd (diff)
downloadgo-git-d3a39f2797d817a402ffdd8d1e321bf9c5700647.tar.gz
Merge branch 'master' of github.com:src-d/go-git
-rw-r--r--.travis.yml14
-rw-r--r--Makefile36
2 files changed, 38 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index 7ab153a..9b7ee12 100644
--- a/.travis.yml
+++ b/.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)
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..18e9991
--- /dev/null
+++ b/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; \