diff options
author | teor <teor@torproject.org> | 2019-04-01 14:11:20 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2019-04-01 14:11:20 +1000 |
commit | 7014e57f4a05d2be5486aedd754272c70d365354 (patch) | |
tree | 58ffc93d30794f7955af7d0b85d5741ab4dbdefa /Makefile.am | |
parent | 3280e9a116df6202dba4e3ee50a9c9d2a1f6699d (diff) | |
parent | 33be8d8295415491fc06bee47729e86d9efcd126 (diff) | |
download | tor-7014e57f4a05d2be5486aedd754272c70d365354.tar.gz tor-7014e57f4a05d2be5486aedd754272c70d365354.zip |
Merge branch 'bug29036-29962-034' into bug29036-29962-035
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 2ac13f8836..494c8a178a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -285,7 +285,9 @@ test-full: need-stem-path need-chutney-path check test-network test-stem test-full-online: need-stem-path need-chutney-path check test-network test-stem-full reset-gcov: - rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda + rm -f $(top_builddir)/src/*/*.gcda $(top_builddir)/src/*/*/*.gcda \ + $(top_builddir)/src/*/*.gcno $(top_builddir)/src/*/*/*.gcno \ + $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov HTML_COVER_DIR=$(top_builddir)/coverage_html coverage-html: all |