From d582c0580dedcdc4fd4589b1fb50f1699cfcecc7 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 27 Mar 2012 17:12:02 -0500 Subject: Added gcov coverage tooling. --- Makefile.am | 2 ++ Makefile.am.coverage | 48 +++++++++++++++++++++++++++++ configure.ac | 12 ++++++++ m4/gcov.m4 | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 7 ++++- 5 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 Makefile.am.coverage create mode 100644 m4/gcov.m4 diff --git a/Makefile.am b/Makefile.am index f90feae..8775921 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,3 +2,5 @@ SUBDIRS = src data test po DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall + +include $(top_srcdir)/Makefile.am.coverage diff --git a/Makefile.am.coverage b/Makefile.am.coverage new file mode 100644 index 0000000..fb97747 --- /dev/null +++ b/Makefile.am.coverage @@ -0,0 +1,48 @@ + +# 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: + @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 + +endif # HAVE_GCOV diff --git a/configure.ac b/configure.ac index f82a404..94619fe 100644 --- a/configure.ac +++ b/configure.ac @@ -9,6 +9,7 @@ AC_PROG_INSTALL AC_PROG_LIBTOOL AM_PROG_CC_C_O AM_SILENT_RULES([yes]) +AC_CONFIG_MACRO_DIR([m4]) IT_PROG_INTLTOOL([0.35.0]) GETTEXT_PACKAGE=indicator-printers @@ -68,6 +69,17 @@ else fi AC_SUBST(DBUSSERVICEDIR) +########################### +# gcov coverage reporting +########################### + +m4_include([m4/gcov.m4]) +AC_TDD_GCOV +AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes]) +AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes]) +AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes]) +AC_SUBST(COVERAGE_CFLAGS) +AC_SUBST(COVERAGE_LDFLAGS) AC_SUBST(AM_CFLAGS, "-Wall") diff --git a/m4/gcov.m4 b/m4/gcov.m4 new file mode 100644 index 0000000..3163584 --- /dev/null +++ b/m4/gcov.m4 @@ -0,0 +1,86 @@ +# Checks for existence of coverage tools: +# * gcov +# * lcov +# * genhtml +# * gcovr +# +# Sets ac_cv_check_gcov to yes if tooling is present +# and reports the executables to the variables LCOV, GCOVR and GENHTML. +AC_DEFUN([AC_TDD_GCOV], +[ + AC_ARG_ENABLE(gcov, + AS_HELP_STRING([--enable-gcov], + [enable coverage testing with gcov]), + [use_gcov=$enableval], [use_gcov=no]) + + if test "x$use_gcov" = "xyes"; then + # we need gcc: + if test "$GCC" != "yes"; then + AC_MSG_ERROR([GCC is required for --enable-gcov]) + fi + + # 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 "$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.]) + fi + + lcov_version_list="1.6 1.7 1.8 1.9" + AC_CHECK_PROG(LCOV, lcov, lcov) + AC_CHECK_PROG(GENHTML, genhtml, genhtml) + + if test "$LCOV"; then + AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [ + glib_cv_lcov_version=invalid + lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'` + for lcov_check_version in $lcov_version_list; do + if test "$lcov_version" = "$lcov_check_version"; then + glib_cv_lcov_version="$lcov_check_version (ok)" + fi + done + ]) + else + lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list" + AC_MSG_ERROR([$lcov_msg]) + fi + + case $glib_cv_lcov_version in + ""|invalid[)] + lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)." + AC_MSG_ERROR([$lcov_msg]) + LCOV="exit 0;" + ;; + esac + + if test -z "$GENHTML"; then + AC_MSG_ERROR([Could not find genhtml from the lcov package]) + 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'` + 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 + +fi +]) # AC_TDD_GCOV diff --git a/src/Makefile.am b/src/Makefile.am index 6e10cb9..40fd228 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,8 +9,11 @@ libprintersmenu_la_SOURCES = \ dbus-names.h libprintersmenu_la_CPPFLAGS = $(APPLET_CFLAGS) +libprintersmenu_la_CFLAGS = $(COVERAGE_CFLAGS) libprintersmenu_la_LIBADD = $(APPLET_LIBS) -lm -libprintersmenu_la_LDFLAGS = -module -avoid-version +libprintersmenu_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -module -avoid-version cups_notifier_sources = \ @@ -39,7 +42,9 @@ indicator_printers_service_SOURCES = \ nodist_indicator_printers_service_SOURCES = $(cups_notifier_sources) indicator_printers_service_CPPFLAGS = $(SERVICE_CFLAGS) +indicator_printers_service_CFLAGS = $(COVERAGE_CFLAGS) indicator_printers_service_LDADD = $(SERVICE_LIBS) +indicator_printers_service_LDFLAGS = $(COVERAGE_LDFLAGS) BUILT_SOURCES = $(cups_notifier_sources) -- cgit v1.2.3 From 23bbf5f139059e38e1c555682a775ec7af50b850 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Apr 2012 14:58:44 -0500 Subject: 0.1.6 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index aa5cab7..b5f425e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -AC_INIT(indicator-printers, 0.1.5) +AC_INIT(indicator-printers, 0.1.6) AC_PREREQ(2.53) AM_INIT_AUTOMAKE([]) -- cgit v1.2.3 From 78ca051ff11390e58daa120a9728e95c41a7e69e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Apr 2012 15:06:01 -0500 Subject: releasing version 0.1.6-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 161d128..4eefdba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-printers (0.1.6-0ubuntu1~ppa1) UNRELEASED; urgency=low +indicator-printers (0.1.6-0ubuntu1~ppa1) precise; urgency=low * New upstream release. * Add test coverage build targets - -- Ted Gould Wed, 04 Apr 2012 15:04:59 -0500 + -- Ted Gould Wed, 04 Apr 2012 15:05:58 -0500 indicator-printers (0.1.5-0ubuntu1) precise; urgency=low -- cgit v1.2.3