Merge lp:~vrruiz/coverage-tutorial/have-gcov into lp:coverage-tutorial

[Víctor R. Ruiz]

[lp:~vrruiz/coverage-tutorial/have-gcov]

4. By Víctor R. Ruiz on 2012-08-16

Oops. Fix flag names.

5. By Víctor R. Ruiz on 2012-08-17

* Substitute coverage flags with --coverage
* Fix use_gcov=yes
* Only call to shtool if installed

6. By Víctor R. Ruiz on 2012-08-17

Use top indentation for Makefile.am.coverage (makes vim happy)

[Allan LeSage (allanlesage)]

Approve, thanks for your diligence; need to update with a couple of other items which have come up since publication.

review: Approve

=== modified file 'Makefile.am.coverage'
--- Makefile.am.coverage	2012-01-27 20:37:05 +0000
+++ Makefile.am.coverage	2012-08-17 00:13:20 +0000
@@ -3,25 +3,25 @@
 
 if HAVE_GCOV
 
-  .PHONY: clean-gcda
-  clean-gcda:
+.PHONY: clean-gcda
+clean-gcda:
 	@echo Removing old coverage results
 	-find -name '*.gcda' -print | xargs -r rm
-  
-  .PHONY: coverage-html generate-coverage-html clean-coverage-html
-  coverage-html: clean-gcda
+
+.PHONY: coverage-html generate-coverage-html clean-coverage-html
+coverage-html: clean-gcda
 	-$(MAKE) $(AM_MAKEFLAGS) -k check
 	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-  
-  generate-coverage-html:
+
+generate-coverage-html:
 	@echo Collecting coverage data
 	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
 	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-  
-  clean-coverage-html: clean-gcda
+
+clean-coverage-html: clean-gcda
 	-$(LCOV) --directory $(top_builddir) -z
 	-rm -rf coverage.info coveragereport
-  
-  clean-local: clean-coverage-html
+
+clean-local: clean-coverage-html
 
 endif # HAVE_GCOV

=== modified file 'gcov.m4'
--- gcov.m4	2012-01-27 20:37:05 +0000
+++ gcov.m4	2012-08-17 00:13:20 +0000
@@ -11,7 +11,9 @@
   AC_ARG_ENABLE(gcov,
   AS_HELP_STRING([--enable-gcov],
 		 [enable coverage testing with gcov]),
-  [use_gcov=$enableval], [use_gcov=no])
+  [use_gcov=yes], [use_gcov=no])
+
+  AM_CONDITIONAL(HAVE_GCOV, test "x$use_gcov" = "xyes")
 
   if test "x$use_gcov" = "xyes"; then
   # we need gcc:
@@ -21,10 +23,11 @@
 
   # Check if ccache is being used
   AC_CHECK_PROG(SHTOOL, shtool, shtool)
-  case `$SHTOOL path $CC` in
-    *ccache*[)] gcc_ccache=yes;;
-    *[)] gcc_ccache=no;;
-  esac
+  if test "$SHTOOL"; then
+    AS_CASE([`$SHTOOL path $CC`],
+                [*ccache*], [gcc_ccache=yes],
+                [gcc_ccache=no])
+  fi
 
   if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
@@ -67,8 +70,8 @@
   changequote([,])
 
   # Add the special gcc flags
-  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
-  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
+  COVERAGE_CFLAGS="--coverage"
+  COVERAGE_CXXFLAGS="--coverage"	
   COVERAGE_LDFLAGS="-lgcov"
 
 fi