Scripts cleanup

Signed-off-by: Joffrey F <joffrey@docker.com>

Author: shin-

Makefile

@@ -81,17 +81,21 @@ unit-test:
 	@echo "Running unit tests..."
 	$(GO_TEST) $(shell go list ./... | grep -vE '/e2e')
 
-clean:
-	rm -Rf ./_build docker-app-*.tar.gz
-
 coverage-bin:
 	$(GO_TEST) -coverpkg="./..." -c -tags testrunmain -o _build/$(BIN_NAME).cov
+	go install ./vendor/github.com/wadey/gocovmerge/
 
 coverage: coverage-bin
+	@echo "Running e2e tests (coverage)..."
 	DOCKERAPP_BINARY=../codecoverage/coverage-bin $(GO_TEST) -v ./e2e
+	@echo "Running unit tests (coverage)..."
 	$(GO_TEST) -cover -test.coverprofile=codecoverage/unit.out $(shell go list ./... | grep -vE '/vendor/|/e2e')
 	gocovmerge codecoverage/*.out > codecoverage/all.out
 	go tool cover -func codecoverage/all.out
+	go tool cover -html codecoverage/all.out -o codecoverage/coverage.html
+
+clean:
+	rm -Rf ./_build docker-app-*.tar.gz codecoverage/*.out codecoverage/*.html
 
 ##########################
 # Continuous Integration #
@@ -116,5 +120,5 @@ ci-gradle-test:
 	  -e GRADLE_USER_HOME=/tmp/gradle \
 	  gradle:jdk8 bash -c "cd /gradle && gradle --stacktrace build && cd example && gradle renderIt"
 
-.PHONY: bin bin-all test check lint e2e-test e2e-all unit-test clean ci-lint ci-test ci-bin-all ci-e2e-all ci-gradle-test
+.PHONY: bin bin-all release test check lint test-cov e2e-test e2e-all unit-test coverage coverage-bin clean ci-lint ci-test ci-bin-all ci-e2e-all ci-gradle-test
 .DEFAULT: all

codecoverage/coverage-bin

@@ -3,5 +3,10 @@
 # This script is a proxy that injects the required test flags and strips out test output
 # It allows us to use a coverage-enabled binary for e2e tests
 
-../_build/docker-app.cov $* -test.v -test.coverprofile=../codecoverage/e2e.out | \
-grep -vE '^PASS$' | grep -vE '^coverage: [0-9]+\.[0-9]+% of statements in .+$' | grep -v '^=== RUN   TestRunMain$'
+../_build/docker-app.cov \
+    $* \
+    -test.coverprofile=../codecoverage/$(uuidgen).out \
+    -test.v \
+| grep -vE '^PASS$' \
+| grep -vE '^coverage: [0-9]+\.[0-9]+% of statements in .+$' \
+| grep -v '^=== RUN   TestRunMain$'