From 3011ca4a9a99eb205bc09ae3236780a25c6e6ace Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 18 Sep 2020 18:17:42 +0200 Subject: [PATCH] test/coverage: fix paths --- test/Makefile | 6 +----- test/auto-pts/coverage.sh | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/test/Makefile b/test/Makefile index d44fc21e0..444a12469 100644 --- a/test/Makefile +++ b/test/Makefile @@ -89,8 +89,6 @@ test-coverage-ble: subdirs $(MAKE) test-ble # collect traces lcov --capture --rc lcov_branch_coverage=1 --directory . --exclude "/Applications/*" --exclude "/Library/*" --exclude "/usr/*" --exclude "*/test/*" --output-file coverage-unit-ble.info - # strip path prefix such that paths start with 'btstack' - sed -i.bak -e 's|/Users/mringwal/buildbot-worker/test-develop/build|btstack|' coverage-unit-ble.info test-coverage: subdirs # delete trace data @@ -99,12 +97,10 @@ test-coverage: subdirs $(MAKE) test # collect traces lcov --capture --rc lcov_branch_coverage=1 --directory . --exclude "/Applications/*" --exclude "/Library/*" --exclude "/usr/*" --exclude "*/test/*" --output-file coverage-unit.info - # strip path prefix such that paths start with 'btstack' - sed -i.bak -e 's|/Users/mringwal/buildbot-worker/test-develop/build|btstack|' coverage-unit.info coverage: test-coverage test-coverage-ble # download pts coverage and fix paths - curl https://bluekitchen-gmbh.com/btstack/develop/coverage-pts.info > coverage-pts.info + curl https://bluekitchen-gmbh.com/btstack/develop/coverage-pts.info | sed 's|buildbot-worker/auto-pts/btstack/|buildbot-worker/test-develop/build|' > coverage-pts.info # combine unit[-ble] and pts lcov --rc lcov_branch_coverage=1 -a coverage-pts.info -a coverage-unit.info --output-file coverage.info diff --git a/test/auto-pts/coverage.sh b/test/auto-pts/coverage.sh index c6a212219..853c19640 100755 --- a/test/auto-pts/coverage.sh +++ b/test/auto-pts/coverage.sh @@ -3,9 +3,6 @@ # collect traces from auto-pts run (exclude chipset/zephyr) lcov --capture --rc lcov_branch_coverage=1 --directory . --exclude "/Applications/*" --exclude "/Library/*" --exclude "/usr/*" --exclude "*/test/*" --exclude "*/chipset/*" --output-file coverage-pts.info -# strip path prefix such that paths start with 'btstack' -sed -i.bak -e 's|/Users/mringwal/buildbot-worker/auto-pts/||' coverage-pts.info - # optional: download unit tests, merge and filter results like in ../Makefile # generate html output