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

diff --git a/.travis.yml b/.travis.yml
index 336b67d2997d7bea192534aa935754610882585d..456b5abc56a9e4db8b7ef7bd026918d9f28a221e 100644 (file)
--- 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 e4be3f26f9c9d3480f099b8f792677fe366e1a27..4b1687f92152d50db638769b78b856131aa38092 100644 (file)
--- 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