[tor-commits] [tor/maint-0.3.5] Makefile: delete all the gcov-related files in reset-gcov

[teor at torproject.org]

commit 57e9fe2bbaa66ee907d68cdf7ebcf2111bd71ac9
Author: teor <teor at torproject.org>
Date:   Mon Apr 1 13:49:27 2019 +1000

    Makefile: delete all the gcov-related files in reset-gcov
    
    And fix a comment.
    
    See:
    https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
---
 .travis.yml | 2 +-
 Makefile.am | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 336b67d29..456b5abc5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,7 +168,7 @@ after_failure:
   - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi
 
 before_cache:
-    # Delete all .gcda files.
+  ## Delete all gcov files.
   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then make reset-gcov; fi
 
 notifications:
diff --git a/Makefile.am b/Makefile.am
index e4be3f26f..4b1687f92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,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