From 83640a595b99c7e19133e649359a6f3d8133ca4c Mon Sep 17 00:00:00 2001 From: zeripath Date: Wed, 1 Sep 2021 03:43:29 +0100 Subject: [PATCH] Workaround coverage bug part 2 (#16906) * Workaround coverage bug part 2 Just grep away bad lines from coverage files. Signed-off-by: Andrew Thornton * try again Signed-off-by: Andrew Thornton --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 24d47199a9..953d9348b0 100644 --- a/Makefile +++ b/Makefile @@ -385,8 +385,8 @@ test\#%: .PHONY: coverage coverage: - grep -v '^0$$' coverage.out > coverage-bodged.out - grep -v '^0$$' integration.coverage.out > integration.coverage-bodged.out + grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' coverage.out > coverage-bodged.out + grep '^\(mode: .*\)\|\(.*:[0-9]\+\.[0-9]\+,[0-9]\+\.[0-9]\+ [0-9]\+ [0-9]\+\)$$' integration.coverage.out > integration.coverage-bodged.out GO111MODULE=on $(GO) run -mod=vendor build/gocovmerge.go integration.coverage-bodged.out coverage-bodged.out > coverage.all || (echo "gocovmerge failed"; echo "integration.coverage.out"; cat integration.coverage.out; echo "coverage.out"; cat coverage.out; exit 1) .PHONY: unit-test-coverage