From 9ed5deefffa6ff37357ca3e0b9e44b7c41e82200 Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 31 Aug 2021 17:49:13 +0100 Subject: [PATCH 1/2] Workaround coverage bug part 2 Just grep away bad lines from coverage files. Signed-off-by: Andrew Thornton --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 24d47199a939a..1221d9378ba75 100644 --- a/Makefile +++ b/Makefile @@ -385,8 +385,9 @@ test\#%: .PHONY: coverage coverage: - grep -v '^0$$' coverage.out > coverage-bodged.out - grep -v '^0$$' integration.coverage.out > integration.coverage-bodged.out + + grep -v '^(mode: .*)|(.*:[0-9]+\.[0-9]+,[0-9]+\.[0-9]+ [0-9]+ [0-9]+)$$' coverage.out > coverage-bodged.out + grep -v '^(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 From 4cd2ad214c7f3c47715ca78cc12121a44447f2bf Mon Sep 17 00:00:00 2001 From: Andrew Thornton Date: Tue, 31 Aug 2021 18:28:48 +0100 Subject: [PATCH 2/2] try again Signed-off-by: Andrew Thornton --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1221d9378ba75..953d9348b008d 100644 --- a/Makefile +++ b/Makefile @@ -385,9 +385,8 @@ test\#%: .PHONY: coverage coverage: - - grep -v '^(mode: .*)|(.*:[0-9]+\.[0-9]+,[0-9]+\.[0-9]+ [0-9]+ [0-9]+)$$' coverage.out > coverage-bodged.out - grep -v '^(mode: .*)|(.*:[0-9]+\.[0-9]+,[0-9]+\.[0-9]+ [0-9]+ [0-9]+)$$' 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