From 89047ab598178a6f484041fa5dbecd538f2b231f Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 5 Dec 2017 09:20:25 -0800 Subject: [PATCH 1/2] Dockerfile-test: use forked version of gocovmerge Signed-off-by: Gyuho Lee --- Dockerfile-test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-test b/Dockerfile-test index 5eeccb14e..dea3ab0f8 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -49,7 +49,7 @@ RUN go get -v -u -tags spell github.com/chzchzchz/goword \ && go get -v -u honnef.co/go/tools/cmd/gosimple \ && go get -v -u honnef.co/go/tools/cmd/unused \ && go get -v -u honnef.co/go/tools/cmd/staticcheck \ - && go get -v -u github.com/wadey/gocovmerge \ + && go get -v -u github.com/gyuho/gocovmerge \ && go get -v -u github.com/gordonklaus/ineffassign \ && go get -v -u github.com/alexkohler/nakedret \ && /tmp/install-marker.sh amd64 \ From f97233d206eb3975a64f49dadd59b0e57c1f0fe4 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 4 Dec 2017 18:56:20 -0800 Subject: [PATCH 2/2] test: log gocovmerge merging Signed-off-by: Gyuho Lee --- test | 1 + 1 file changed, 1 insertion(+) diff --git a/test b/test index 21077c3f9..00c5a4ec4 100755 --- a/test +++ b/test @@ -202,6 +202,7 @@ function cov_pass { # expects to start with a non-empty file cp "$COVERDIR"/etcdserver.coverprofile "$COVERDIR"/cover.out for f in "$COVERDIR"/*.coverprofile; do + echo "merging test coverage file ${f}" gocovmerge "$f" "$COVERDIR"/cover.out >"$COVERDIR"/cover.tmp || failed="$failed $f" if [ -s "$COVERDIR"/cover.tmp ]; then mv "$COVERDIR"/cover.tmp "$COVERDIR"/cover.out