Merge branch 'bug29036-29962-034' into bug29036-29962-035

This commit is contained in:
teor 2019-04-05 12:58:32 +10:00
commit db71bceb40
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A

View File

@ -284,9 +284,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 test-full-online: need-stem-path need-chutney-path check test-network test-stem-full
# We can't delete the gcno files, because they are created when tor is compiled
reset-gcov: 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 $(top_builddir)/src/*/*.gcov $(top_builddir)/src/*/*/*.gcov
HTML_COVER_DIR=$(top_builddir)/coverage_html HTML_COVER_DIR=$(top_builddir)/coverage_html