Merge pull request #614 from weaveworks/612-release-test

Release script should use make tests to run tests; also fix build warning.

Makefile

@@ -46,8 +46,8 @@ $(APP_EXE) $(PROBE_EXE) $(RUNSVINIT): $(SCOPE_BACKEND_BUILD_UPTODATE)
 	$(SUDO) docker run $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope -e GOARCH -e GOOS \
 		$(SCOPE_BACKEND_BUILD_IMAGE) SCOPE_VERSION=$(SCOPE_VERSION) $@
 else
-$(APP_EXE) $(PROBE_EXE):
-	go build -ldflags "-extldflags \"-static\" -X main.version $(SCOPE_VERSION)" -tags netgo -o $@ ./$(@D)
+$(APP_EXE) $(PROBE_EXE): $(SCOPE_BACKEND_BUILD_UPTODATE)
+	go build -ldflags "-extldflags \"-static\" -X main.version=$(SCOPE_VERSION)" -tags netgo -o $@ ./$(@D)
 	@strings $@ | grep cgo_stub\\\.go >/dev/null || { \
 	        rm $@; \
 	        echo "\nYour go standard library was built without the 'netgo' build tag."; \
@@ -106,8 +106,7 @@ clean:
 ifeq ($(BUILD_IN_CONTAINER),true)
 tests:
 	$(SUDO) docker run $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope \
-		-e GOARCH -e GOOS -e CIRCLECI --entrypoint=/bin/sh $(SCOPE_BACKEND_BUILD_IMAGE) -c \
-		"cd /go/src/github.com/weaveworks/scope && ./tools/test -no-go-get"
+		-e GOARCH -e GOOS -e CIRCLECI $(SCOPE_BACKEND_BUILD_IMAGE) tests
 else
 tests:
 	./tools/test -no-go-get

backend/build.sh

@@ -6,6 +6,5 @@ set -eux
 #  -v $(pwd):/go/src/github.com/weaveworks/scope
 
 cd $GOPATH/src/github.com/weaveworks/scope
-rm $1 2>/dev/null || true
 make BUILD_IN_CONTAINER=false $@
 

bin/release

@@ -91,7 +91,7 @@ build() {
     sed -i "/SCRIPT_VERSION=/ c\SCRIPT_VERSION=\"$VERSION\"" ./scope
     make SUDO=$SUDO SCOPE_VERSION=$VERSION DOCKERHUB_USER=$DOCKERHUB_USER
 
-    if $(go list -e -f {{.Dir}} github.com/weaveworks/tools)/test; then
+    if make tests; then
         echo -e '\u2713 Tests pass'
     else
         echo -e "\u2757 Tests failed, probably best not publish this one" >&2