summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2021-09-01 03:43:29 +0100
committerGitHub <noreply@github.com>2021-08-31 22:43:29 -0400
commit83640a595b99c7e19133e649359a6f3d8133ca4c (patch)
treed22bb1520c69f4b9bb5b99716c4a95913b35f044
parentcbf05c3f795c1eed999dafe8d0757495e07f1ee2 (diff)
downloadgitea-83640a595b99c7e19133e649359a6f3d8133ca4c.tar.gz
gitea-83640a595b99c7e19133e649359a6f3d8133ca4c.zip
Workaround coverage bug part 2 (#16906)
* Workaround coverage bug part 2 Just grep away bad lines from coverage files. Signed-off-by: Andrew Thornton <art27@cantab.net> * try again Signed-off-by: Andrew Thornton <art27@cantab.net>
-rw-r--r--Makefile4
1 files 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