diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-12-09 08:38:39 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-12-09 08:38:42 -0500 |
| commit | 1ebf6402fc7cc7f918f276ee6fde369ba813beb2 (patch) | |
| tree | eea987ae7e73d668f53c92ec0586344fb2ec5a13 | |
| parent | 91559da683dbf5de101b7722cdac341963d2433a (diff) | |
| parent | f736f6920b160c9e7d7072500ddd0459c5181f86 (diff) | |
Merge #17647: lcov: filter depends from coverage reports
f736f6920b160c9e7d7072500ddd0459c5181f86 lcov: filter /usr/lib64 from coverage report (nijynot)
a5a705b46dd32f93857e916311e3b71cae8be6b7 lcov: filter depends from coverage report (nijynot)
Pull request description:
If you build the binaries with the `depends` folder and then generate coverage reports with `make cov`, `depends` will be included in the coverage reports. Coverage of the dependencies are not that interesting and should be filtered.
ACKs for top commit:
laanwj:
code review ACK f736f6920b160c9e7d7072500ddd0459c5181f86
MarcoFalke:
ACK f736f6920b160c9e7d7072500ddd0459c5181f86 🐇
Tree-SHA512: 57c3e09f32e71523afff6ddc4f92bc35ab7b783f26f7a7380ae7556222954111cccce4c6dbc99305c424818f91e15bf5fe3532a7dca1daaa8ad71315d1dd857c
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index deae2c1b57..f121c33b24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,7 +99,7 @@ $(OSX_APP)/Contents/PkgInfo: $(OSX_APP)/Contents/Resources/empty.lproj: $(MKDIR_P) $(@D) - @touch $@ + @touch $@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST) $(MKDIR_P) $(@D) @@ -189,7 +189,16 @@ $(BITCOIN_WALLET_BIN): FORCE $(MAKE) -C src $(@F) if USE_LCOV -LCOV_FILTER_PATTERN=-p "/usr/include/" -p "/usr/lib/" -p "src/leveldb/" -p "src/bench/" -p "src/univalue" -p "src/crypto/ctaes" -p "src/secp256k1" +LCOV_FILTER_PATTERN = \ + -p "/usr/include/" \ + -p "/usr/lib/" \ + -p "/usr/lib64/" \ + -p "src/leveldb/" \ + -p "src/bench/" \ + -p "src/univalue" \ + -p "src/crypto/ctaes" \ + -p "src/secp256k1" \ + -p "depends" baseline.info: $(LCOV) -c -i -d $(abs_builddir)/src -o $@ @@ -321,4 +330,3 @@ clean-local: clean-docs rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP) rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache share/rpcauth/__pycache__ rm -rf osx_volname dist/ dpi36.background.tiff dpi72.background.tiff - |