Merge lp:~mikemc/unity-scope-click/fix-coverage into lp:unity-scope-click

[Mike McCracken]

- Add coverage reporting for non-test vala files only.

- Add coverage reporting for non-test vala files only.

also removes gcovr support that doesn't work well with vala anyway

build with this to get coverage HTML
./autogen.sh --enable-gcov && make coverage-html

[Roberto Alsina (ralsina)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/140/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/140/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

You mentioned you were going to update this to not strip the gcovr bits out, to keep it from diverging too much from upstream (where this really belongs, and which needs to be properly packaged).

review: Needs Information

[lp:~mikemc/unity-scope-click/fix-coverage]

101. By Mike McCracken on 2014-01-07

bring coverage support more into sync with 'upstream' at lp:~allanlesage/+junk/coverage-tools , so using that directly in the future will be easier

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/46

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/148/rebuild

review: Approve (continuous-integration)

[lp:~mikemc/unity-scope-click/fix-coverage]

102. By Mike McCracken on 2014-01-09

add back check for HAVE_GCOVR

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/51
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/51

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/153/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'Makefile.am.coverage'
--- Makefile.am.coverage	2013-07-18 18:05:15 +0000
+++ Makefile.am.coverage	2014-01-09 14:51:47 +0000
@@ -1,48 +1,45 @@
 
 # Coverage targets
 
-.PHONY: clean-gcno clean-gcda \
-	coverage-html generate-coverage-html clean-coverage-html \
-	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
-
-clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
-
 if HAVE_GCOV
 
-clean-gcno:
-	@echo Removing old coverage instrumentation
-	-find -name '*.gcno' -print | xargs -r rm
-
-clean-gcda:
+  .PHONY: clean-data
+  clean-data:
 	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
-  
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) 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
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coveragereport
-
-if HAVE_GCOVR
-
-coverage-gcovr: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
-	
-generate-coverage-gcovr:
-	@echo Generating coverage GCOVR report
-	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-	
-clean-coverage-gcovr: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
-
-endif # HAVE_GCOVR
+	$(AM_V_at)-find -name '*.gcda' -print0 | xargs -0 -r rm
+	$(AM_V_at)-find -name '*.gcno' -print0 | xargs -0 -r rm
+
+  .PHONY: coverage-html generate-coverage-html clean-coverage-html
+  coverage-html: clean-data
+	$(AM_V_at)-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+
+  collect-coverage-data:
+	$(LCOV_verbose) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+
+  generate-coverage-html: collect-coverage-data
+	$(LCOV_verbose) --output-file $(top_builddir)/coverage.info --remove $(top_builddir)/coverage.info "*.c" "*.h" "*.vapi" "/usr/share/vala*" "test-*"
+	$(GENHTML_verbose) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details --demangle-cpp coverage.info
+
+  clean-coverage-html: clean-data
+	@echo Removing coverage HTML report
+	$(AM_V_at)-$(LCOV_verbose) --directory $(top_builddir) -z
+	$(AM_V_at)-rm -rf coverage.info coveragereport
+
+  .PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
+  coverage-xml: clean-data
+	@echo Running test suite
+	$(AM_V_at)-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
+
+  generate-coverage-xml:
+	@echo "  GEN    coverage.xml"
+	$(AM_V_at)$(GCOVR_verbose) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml --object-directory=$(abs_builddir)/.libs
+
+  clean-coverage-xml: clean-data
+	@echo Removing coverage XML report
+	$(AM_V_at)-rm -rf $(top_builddir)/coverage.xml
+
+  clean-local: clean-coverage-html clean-coverage-xml
 
 endif # HAVE_GCOV

=== modified file 'acinclude.m4'
--- acinclude.m4	2013-12-17 17:30:12 +0000
+++ acinclude.m4	2014-01-09 14:51:47 +0000
@@ -70,9 +70,10 @@
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
 
-  lcov_version_list="1.6 1.7 1.8 1.9"
+  lcov_version_list="1.6 1.7 1.8 1.9 1.10"
   AC_CHECK_PROG(LCOV, lcov, lcov)
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)
+  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
 
   if test "$LCOV"; then
     AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
@@ -101,26 +102,39 @@
     AC_MSG_ERROR([Could not find genhtml from the lcov package])
   fi
 
+  if test -z "$GCOVR"; then
+    AC_MSG_ERROR([Could not find gcovr; easy_install (or pip) gcovr])
+  fi
+
   ac_cv_check_gcov=yes
-  ac_cv_check_lcov=yes
 
   # Remove all optimization flags from CFLAGS
   changequote({,})
   CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+  CXXFLAGS=`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`
   changequote([,])
 
   # Add the special gcc flags
   COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
   COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
   COVERAGE_LDFLAGS="-lgcov"
-
-  # Check availability of gcovr
-  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
-  if test -z "$GCOVR"; then
-    ac_cv_check_gcovr=no
-  else
-    ac_cv_check_gcovr=yes
-  fi
+  COVERAGE_VALAFLAGS="--debug"
+
+  # Define verbose versions of the tools
+  AC_SUBST(LCOV_verbose, '$(LCOV_verbose_$(V))')
+  AC_SUBST(LCOV_verbose_, '$(LCOV_verbose_$(AM_DEFAULT_VERBOSITY))')
+  AC_SUBST(LCOV_verbose_0, '@$(LCOV) --quiet')
+  AC_SUBST(LCOV_verbose_1, '$(LCOV)')
+
+  AC_SUBST(GENHTML_verbose, '$(GENHTML_verbose_$(V))')
+  AC_SUBST(GENHTML_verbose_, '$(GENHTML_verbose_$(AM_DEFAULT_VERBOSITY))')
+  AC_SUBST(GENHTML_verbose_0, '@LANG=C $(GENHTML) --quiet')
+  AC_SUBST(GENHTML_verbose_1, 'LANG=C $(GENHTML)')
+
+  AC_SUBST(GCOVR_verbose, '$(GCOVR_verbose_$())')
+  AC_SUBST(GCOVR_verbose_, '$(GCOVR_verbose_$(AM_DEFAULT_VERBOSITY))')
+  AC_SUBST(GCOVR_verbose_0, '@$(GCOVR)')
+  AC_SUBST(GCOVR_verbose_1, '$(GCOVR) -v')
 
 fi
 ]) # AC_TDD_GCOV

=== modified file 'configure.ac'
--- configure.ac	2013-12-17 17:30:12 +0000
+++ configure.ac	2014-01-09 14:51:47 +0000
@@ -34,6 +34,7 @@
 AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
 AC_SUBST(COVERAGE_CFLAGS)
 AC_SUBST(COVERAGE_LDFLAGS)
+AC_SUBST(COVERAGE_VALAFLAGS)
 
 #####################################################
 # Check for module and library dependancies

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-12-18 19:19:12 +0000
+++ src/Makefile.am	2014-01-09 14:51:47 +0000
@@ -21,6 +21,7 @@
 	libclickscope.la
 
 libclickscope_la_VALAFLAGS = \
+	$(COVERAGE_VALAFLAGS) \
 	--thread \
 	--vapidir $(srcdir) \
 	--vapidir $(builddir) \
@@ -67,6 +68,7 @@
 	click-scope-main.vala
 
 test_click_scope_VALAFLAGS = \
+	$(COVERAGE_VALAFLAGS) \
 	--thread \
 	--pkg oauth \
 	--pkg signon \