Merge lp:~vrruiz/gnome-control-center-signon/coverage-fixes into lp:gnome-control-center-signon

[Víctor R. Ruiz]

Move from --enable-lcov to --enable-gcov and make coverage-xml

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:125
http://s-jenkins:8080/job/gnome-control-center-signon-ci/3/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=amd64/3/console
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=i386/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gnome-control-center-signon-ci/3//rebuild/?

review: Needs Fixing (continuous-integration)

[David King (amigadave)]

I do not see the Makefile.am.coverage file being added, and when I run autogen.sh from a clean checkout I get:

automake-1.11: cannot open < Makefile.am.coverage: No such file or directory

Did you test this? Additionally, you have provided no justification for this change in the description. Is it to match other webapps or Product Strategy projects, and if so, is the coverage Makefile.am snippet in a common repository anywhere?

review: Needs Fixing

[lp:~vrruiz/gnome-control-center-signon/coverage-fixes]

126. By Víctor R. Ruiz on 2012-12-05

Add Makefile.am.coverage

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:126
http://s-jenkins:8080/job/gnome-control-center-signon-ci/4/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=amd64/4/console
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=i386/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gnome-control-center-signon-ci/4//rebuild/?

review: Needs Fixing (continuous-integration)

[Víctor R. Ruiz (vrruiz)]

Yes, I tested this, but I forgot to add the file. Already done. Makefile.am.coverage is the file we are using in PS QA with standard rules, available at lp:coverage-tutorial

[David King (amigadave)]

OK, but there are a few problems with this that should be fixed:

* it does not support the automake silent rule predefined variables (for example, AM_V_at and AM_V_GEN)
* it adds a dependency on gcovr and does not check for it in configure.ac
* it redefines the "clean-local" and ".PHONY" targets that are already defined in Makefile.am
* find does not need to use xargs, it can call rm directly
* "pwd" is used in the "generate-coverage-xml" rule, when one of the standard automake variables should be used (either "top_builddir" or "top_srcdir" I guess)
* it uses echo to print some messages to stdout, which ignores the silent rules setting. if those are desired, some custom verbosity rules should be added instead, much like the automake silent rule predefined variables

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:126
http://s-jenkins:8080/job/gnome-control-center-signon-ci/5/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=amd64/5/console
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=i386/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gnome-control-center-signon-ci/5//rebuild/?

review: Needs Fixing (continuous-integration)

[lp:~vrruiz/gnome-control-center-signon/coverage-fixes]

127. By Víctor R. Ruiz on 2012-12-05

Fix make rule clean-gcda

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:127
http://s-jenkins:8080/job/gnome-control-center-signon-ci/6/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=amd64/6/console
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=i386/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gnome-control-center-signon-ci/6//rebuild/?

review: Needs Fixing (continuous-integration)

[lp:~vrruiz/gnome-control-center-signon/coverage-fixes]

128. By Víctor R. Ruiz on 2012-12-05

Silent support for Makefile.am.coverage

129. By Víctor R. Ruiz on 2012-12-05

Add gcovr check to configure.ac

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:129
http://s-jenkins:8080/job/gnome-control-center-signon-ci/9/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=amd64/9/console
    FAILURE: http://s-jenkins:8080/job/gnome-control-center-signon-ci/./build=pbuilder,distribution=raring,flavor=i386/9/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gnome-control-center-signon-ci/9//rebuild/?

review: Needs Fixing (continuous-integration)

Unmerged revisions

129. By Víctor R. Ruiz on 2012-12-05

Add gcovr check to configure.ac

128. By Víctor R. Ruiz on 2012-12-05

Silent support for Makefile.am.coverage

127. By Víctor R. Ruiz on 2012-12-05

Fix make rule clean-gcda

126. By Víctor R. Ruiz on 2012-12-05

Add Makefile.am.coverage

125. By Víctor R. Ruiz on 2012-12-04

Standardized coverage make rules

=== modified file 'Makefile.am'
--- Makefile.am	2012-10-29 22:59:14 +0000
+++ Makefile.am	2012-12-05 17:32:29 +0000
@@ -323,28 +323,16 @@
 	OtherService.service)
 
 # Code coverage reporting.
-if CREDENTIALS_ENABLE_LCOV
+if CREDENTIALS_ENABLE_GCOV
 # Depend on full-report so that all the tests are run.
-lcov: full-report
-	$(AM_V_at)$(LCOV) --base-directory $(top_builddir) \
-		--directory $(top_builddir)/src --capture \
-		--output-file credentials-lcov.info --test-name CREDENTIALS \
-		--no-checksum --compat-libtool
-	$(AM_V_at)LANG=C $(LCOV_GENHTML) --prefix $(top_builddir) \
-		--output-directory credentials-lcov \
-		--title "Credentials code coverage" --legend --show-details \
-		credentials-lcov.info
+include $(top_srcdir)/Makefile.am.coverage
 
-lcov-clean:
-	$(AM_V_at)$(LCOV) --directory $(top_builddir) -z
-	$(AM_V_at)rm -rf credentials-lcov.info credentials-lcov
-	$(AM_V_at)find -name '*.gcda' -exec rm -f {} +
-else # !CREDENTIALS_ENABLE_LCOV
-lcov:
+else # !CREDENTIALS_ENABLE_GCOV
+coverage:
 	$(AM_V_at)echo "Code coverage reporting not available"
 
-lcov-clean:
-	$(AM_V_at)rm -rf credentials-lcov.info credentials-lcov
+clean-gcda:
+	$(AM_V_at)rm -rf coverage.info coverage.xml coverage-html
 	$(AM_V_at)find -name '*.gcda' -exec rm -f {} +
 endif
 
@@ -420,7 +408,7 @@
 	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) all
 check-local: test
 	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) check
-clean-local: lcov-clean
+clean-local: clean-gcda
 	cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) clean
 	find -name '*.gcno' -exec rm -f {} +
 distclean-local:
@@ -536,4 +524,3 @@
 .PHONY: docs
 .PHONY: install-update-icon-cache uninstall-update-icon-cache
 .PHONY: test test-report perf-report full-report
-.PHONY: lcov lcov-clean

=== added file 'Makefile.am.coverage'
--- Makefile.am.coverage	1970-01-01 00:00:00 +0000
+++ Makefile.am.coverage	2012-12-05 17:32:29 +0000
@@ -0,0 +1,26 @@
+
+# Coverage targets
+
+.PHONY: clean-gcda
+clean-gcda:
+	$(AM_V_at)echo Removing old coverage 
+	$(AM_V_at)find -name '*.gcda' -print | xargs -r rm
+
+.PHONY: coverage-html coverage-xml generate-coverage-html clean-coverage-html
+coverage-html: clean-gcda full-report
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
+
+coverage-xml: clean-gcda full-report
+	 $(AM_V_at)gcovr --xml -r $(top_builddir) -o "$(top_builddir)/coverage.xml" --exclude='.*tests.*'
+
+generate-coverage-html:
+	@echo Collecting coverage data
+	$(AM_V_at)$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
+	$(AM_V_at)$(LCOV) --extract coverage.info "`pwd`/src/*" --extract coverage.info "`pwd`/libaccount-plugin/*" --output-file coverage-src.info
+	$(AM_V_at)LANG=C $(LCOV_GENHTML) --prefix $(top_builddir) --output-directory coverage-html --title "Code Coverage" --legend --show-details coverage-src.info
+
+clean-coverage-html: clean-gcda
+	$(AM_V_at)$(LCOV) --directory $(top_builddir) -z
+	$(AM_V_at)rm -rf coverage.info coverage-src.info coverage-html
+
+

=== modified file 'configure.ac'
--- configure.ac	2012-10-29 15:31:34 +0000
+++ configure.ac	2012-12-05 17:32:29 +0000
@@ -106,14 +106,15 @@
    AC_SUBST([GTESTER_REPORT])])
 AM_CONDITIONAL([CREDENTIALS_ENABLE_TESTS], [test "x$CREDENTIALS_ENABLE_TESTS" = "xtrue"])
 
-# Check for lcov.
-AC_ARG_ENABLE([lcov],
-  [AS_HELP_STRING([--disable-lcov], [Disable lcov code coverage testing])])
+# Check for gcov.
+AC_ARG_ENABLE([gcov],
+  [AS_HELP_STRING([--disable-gcov], [Disable gcov code coverage testing])])
 
-AS_IF([test "x$enable_lcov" != "xno"],
+AS_IF([test "x$enable_gcov" != "xno"],
   [AC_PATH_PROG([LCOV], [lcov], [notfound])
+   AC_PATH_PROG([GCOVR], [gcovr], [notfound])
    AC_PATH_PROG([LCOV_GENHTML], [genhtml], [notfound])
-   AS_IF([test "x$LCOV" = "xnotfound" -o "x$LCOV_GENHTML" = "xnotfound"],
+   AS_IF([test "x$LCOV" = "xnotfound" -o "x$LCOV_GENHTML" = "xnotfound" -o "x$GCOVR" = "xnotfound" ],
      [have_lcov=no],
      [have_lcov=yes])],
   [have_lcov=no])
@@ -123,10 +124,10 @@
    AC_SUBST([LCOV_GENHTML])
    CFLAGS="$CFLAGS -O0 -fprofile-arcs -ftest-coverage"
    LDFLAGS="$LDFLAGS -lgcov"],
-  [AS_IF([test "x$enable_lcov" = "xyes"],
+  [AS_IF([test "x$enable_gcov" = "xyes"],
      [AC_MSG_ERROR([lcov code coverage reporting requested but not found])])])
 
-AM_CONDITIONAL([CREDENTIALS_ENABLE_LCOV], [test "x$have_lcov" = "xyes"])
+AM_CONDITIONAL([CREDENTIALS_ENABLE_GCOV], [test "x$have_lcov" = "xyes"])
 
 # Mallard help.
 YELP_HELP_INIT