appveyor.yml → .appveyor.yml

@@ -5,6 +5,13 @@ shallow_clone: true # for startup speed
 
 environment:
   GOPATH: C:\gopath
+  matrix:
+  - environment:
+    GOVERSION: 1.6.3
+  - environment:
+    GOVERSION: 1.7.5
+  - environment:
+    GOVERSION: 1.8.1
 
 platform:
   - x64
@@ -23,12 +30,13 @@ install:
   - gcc --version
   - g++ --version
   # need bzr for several tests
-  - choco install bzr
+  - choco install -y --force bzr
   - set PATH=C:\Program Files (x86)\Bazaar;%PATH%
   - bzr --version
   # TODO(tianon) - git clone --depth 1 https://github.com/constabulary/integration-tests.git
 
 build_script:
+  - go get github.com/pkg/errors
   - go install -v ./...
 
 test_script:

.travis.yml

@@ -1,8 +1,9 @@
 language: go
 go_import_path: github.com/constabulary/gb
 go:
-  - 1.5.1
-  - 1.4.3
+  - 1.6.x
+  - 1.7.x
+  - 1.8.x
   - tip
 
 sudo: false
@@ -17,10 +18,17 @@ addons:
 install:
   - go get -t -v ./...
   - git clone --quiet --single-branch --depth 1 https://github.com/constabulary/integration-tests.git ../integration-tests
+  - if [[ $TRAVIS_GO_VERSION == 1.4* ]]; then go get -u golang.org/x/tools/cmd/cover; fi
   - echo '#!/bin/bash' > "$GOPATH/bin/sudo"
     && echo 'echo >&2 attempted sudo "$@"' >> "$GOPATH/bin/sudo"
     && chmod +x "$GOPATH/bin/sudo"
 
 script:
-  - go test -v ./...
-  - ../integration-tests/run-all.bash
+  - go install -v ./...
+    && bin/coverage.sh
+    && go build
+    && gb test 
+    && ../integration-tests/run-all.bash
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

README.md

@@ -7,6 +7,8 @@ Unix:
 Windows:
 [![Build status](https://ci.appveyor.com/api/projects/status/rjttg1agmp2sra3h/branch/master?svg=true)](https://ci.appveyor.com/project/davecheney/gb/branch/master)
 
+[![codecov.io](https://codecov.io/github/constabulary/gb/branch/master/graph/badge.svg)](https://codecov.io/github/constabulary/gb)
+
 `gb` is a proof of concept replacement build tool for the [Go programming language](https://golang.org).
 
 I gave a talk about `gb` and the rational for its creation at GDG Berlin in April 2015, [video](https://www.youtube.com/watch?v=c3dW80eO88I) and [slides](http://go-talks.appspot.com/github.com/davecheney/presentations/reproducible-builds.slide#1).
@@ -29,17 +31,23 @@ gb has its own site, [getgb.io](http://getgb.io/), head over there for more info
 
 ## Contributing
 
+### Contribution guidelines
+
+We welcome pull requests, bug fixes and issue reports.
+
+Before proposing a large change, please discuss your change by raising an issue.
+
 ### Road map
 
 #### Completed
 
 - [Cross Compilation](https://github.com/constabulary/gb/milestones/cross-compilation)
 - Tag handling, unify -tags, ENVVARS and GOOS/GOARCH into a single format for binary names and pkg cache
+- gb test improvements, test output, test flag handling
+- [Race detector support](https://github.com/constabulary/gb/issues/96)
 
 #### Todo
 
-- 0.3 series: gb test improvements, test output, ~~flag handling~~ (done)
-  - [Race detector support](https://github.com/constabulary/gb/issues/96)
 - 0.4 series: gb vendor updates and bug fixes
 - 0.5 series: new package resolver (replace go/build)
 
@@ -49,7 +57,3 @@ Big ticket items that are not on the road map yet
 
 - Package BuildID support (make stale detection work like the Go 1.5)
 - `gccgo` toolchain support.
-
-We welcome pull requests, bug fixes and issue reports.
-
-Before proposing a large change, please discuss your change by raising an issue.

action_test.go

@@ -7,10 +7,6 @@ import (
 )
 
 func TestBuildAction(t *testing.T) {
-	actions := func(a ...*Action) []*Action {
-		return a
-	}
-
 	var tests = []struct {
 		pkg    string
 		action *Action
@@ -19,20 +15,20 @@ func TestBuildAction(t *testing.T) {
 		pkg: "a",
 		action: &Action{
 			Name: "build: a",
-			Deps: actions(&Action{Name: "compile: a"}),
+			Deps: []*Action{{Name: "compile: a"}},
 		},
 	}, {
 		pkg: "b",
 		action: &Action{
 			Name: "build: b",
 			Deps: []*Action{
-				&Action{
+				{
 					Name: "link: b",
 					Deps: []*Action{
-						&Action{
+						{
 							Name: "compile: b",
 							Deps: []*Action{
-								&Action{
+								{
 									Name: "compile: a",
 								}},
 						},
@@ -44,12 +40,12 @@ func TestBuildAction(t *testing.T) {
 		action: &Action{
 			Name: "build: c",
 			Deps: []*Action{
-				&Action{
+				{
 					Name: "compile: c",
 					Deps: []*Action{
-						&Action{
+						{
 							Name: "compile: a",
-						}, &Action{
+						}, {
 							Name: "compile: d.v1",
 						}},
 				}},
@@ -59,22 +55,22 @@ func TestBuildAction(t *testing.T) {
 		ctx := testContext(t)
 		defer ctx.Destroy()
 		pkg, err := ctx.ResolvePackage(tt.pkg)
-		if !sameErr(err, tt.err) {
+		if !reflect.DeepEqual(err, tt.err) {
 			t.Errorf("ctx.ResolvePackage(%v): want %v, got %v", tt.pkg, tt.err, err)
 			continue
 		}
 		if err != nil {
 			continue
 		}
 		got, err := BuildPackages(pkg)
-		if !sameErr(err, tt.err) {
+		if !reflect.DeepEqual(err, tt.err) {
 			t.Errorf("BuildAction(%v): want %v, got %v", tt.pkg, tt.err, err)
 			continue
 		}
 		deleteTasks(got)
 
 		if !reflect.DeepEqual(tt.action, got) {
-			t.Errorf("BuildAction(%v): want %#v, got %#v", tt.pkg, tt.action, got)
+			t.Errorf("BuildAction(%v): want %#+v, got %#+v", tt.pkg, tt.action, got)
 		}
 
 		// double underpants

bin/coverage.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+rm -f coverage.txt
+
+for d in $(go list github.com/constabulary/gb/...); do
+  go test -coverprofile=profile.out -covermode=atomic $d
+
+  if [ -f profile.out ]; then
+    cat profile.out >> coverage.txt
+    rm profile.out
+  fi
+done