From d9416f4f284c401b8848e4bd249fd5cbd25142c3 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 27 Mar 2012 17:29:55 -0500 Subject: Added gcov coverage tooling. --- Makefile.am | 2 ++ Makefile.am.coverage | 48 +++++++++++++++++++++++++++++ configure.ac | 23 +++++++++++--- m4/gcov.m4 | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 14 +++++++-- 5 files changed, 166 insertions(+), 7 deletions(-) create mode 100644 Makefile.am.coverage create mode 100644 m4/gcov.m4 diff --git a/Makefile.am b/Makefile.am index d63dac8..bb27c84 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,3 +72,5 @@ test-ascii-quotes: po @chmod +x $@ CLEANFILES = $(TESTS) + +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 ab12f12..a6a7b05 100644 --- a/configure.ac +++ b/configure.ac @@ -197,6 +197,18 @@ AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory]) AM_GLIB_GNU_GETTEXT +########################### +# 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) + ########################### # Files ########################### @@ -237,9 +249,10 @@ AC_MSG_NOTICE([ SUS Indicator Configuration: - Prefix: $prefix - Indicator Dir: $INDICATORDIR - Indicator GTK: $with_gtk - Logout Helper: $have_gtklogouthelper - APT support: $enable_apt + Prefix: $prefix + Indicator Dir: $INDICATORDIR + Indicator GTK: $with_gtk + Logout Helper: $have_gtklogouthelper + APT support: $enable_apt + Coverage reporting: $use_gcov ]) 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 a1e443e..b29e8d4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,10 +26,13 @@ libsession_la_SOURCES = \ accounts-service-user-client.h libsession_la_CFLAGS = \ $(APPLET_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Indicator-Session\" libsession_la_LIBADD = $(APPLET_LIBS) -libsession_la_LDFLAGS = -module -avoid-version +libsession_la_LDFLAGS = \ + $(COVERAGE_LDFLAGS) \ + -module -avoid-version consolekit-manager-client.h: $(srcdir)/org.freedesktop.ConsoleKit.Manager.xml dbus-binding-tool \ @@ -137,11 +140,14 @@ indicator_session_service_CFLAGS = \ -DLIBEXECDIR=\"$(libexecdir)\" \ -Wall -Werror \ -DG_LOG_DOMAIN=\"Indicator-Session\" \ - $(GUDEV_CFLAGS) + $(GUDEV_CFLAGS) \ + $(COVERAGE_CFLAGS) indicator_session_service_LDADD = \ $(SESSIONSERVICE_LIBS) \ $(GCONF_LIBS) \ $(GUDEV_LIBS) +indicator_session_service_LDFLAGS = \ + $(COVERAGE_LDFLAGS) ################# # GTK Logout Stuff @@ -159,6 +165,7 @@ gtk_logout_helper_CFLAGS = \ $(SESSIONSERVICE_CFLAGS) \ $(GTKLOGOUTHELPER_CFLAGS) \ $(GCONF_CFLAGS) \ + $(COVERAGE_CFLAGS) \ -Wall -Werror \ -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\"" @@ -166,6 +173,9 @@ gtk_logout_helper_LDADD = \ $(SESSIONSERVICE_LIBS) \ $(GTKLOGOUTHELPER_LIBS) \ $(GCONF_LIBS) + +gtk_logout_helper_LDFLAGS = \ + $(COVERAGE_LDFLAGS) endif -- cgit v1.2.3 From ac5d7a54f7dacb776f2957d925450e97ca6f544a Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Thu, 29 Mar 2012 12:08:03 -0500 Subject: Advised changes to fix implicit declarations. --- src/gtk-logout-helper.c | 1 + src/session-service.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/gtk-logout-helper.c b/src/gtk-logout-helper.c index 1975121..f5c11ba 100644 --- a/src/gtk-logout-helper.c +++ b/src/gtk-logout-helper.c @@ -22,6 +22,7 @@ with this program. If not, see . */ #include +#include #include #include #include diff --git a/src/session-service.c b/src/session-service.c index 6ee18e9..1dd1e14 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -26,6 +26,7 @@ with this program. If not, see . #include #include +#include #include #include -- cgit v1.2.3 From 261b1b9ce49c1fe174a0e23b1c5f1b1a03b1c566 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Apr 2012 12:38:01 -0500 Subject: Dropping the desktop files from the build --- data/Makefile.am | 27 ------------------------ data/indicator-session-lock-screen.desktop.in.in | 10 --------- data/indicator-session-logout.desktop.in.in | 10 --------- data/indicator-session-restart.desktop.in.in | 10 --------- data/indicator-session-shutdown.desktop.in.in | 10 --------- 5 files changed, 67 deletions(-) delete mode 100644 data/indicator-session-lock-screen.desktop.in.in delete mode 100644 data/indicator-session-logout.desktop.in.in delete mode 100644 data/indicator-session-restart.desktop.in.in delete mode 100644 data/indicator-session-shutdown.desktop.in.in diff --git a/data/Makefile.am b/data/Makefile.am index 3b8de1f..27b5ea2 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -25,30 +25,3 @@ EXTRA_DIST = \ CLEANFILES = \ $(dbus_services_DATA) \ $(gsettings_SCHEMAS) - -if BUILD_GTKLOGOUTHELPER -@INTLTOOL_DESKTOP_RULE@ - -%.desktop.in: %.desktop.in.in - sed \ - -e "s|\@libexecdir\@|$(libexecdir)|" \ - -e "s|\@bindir\@|$(bindir)|" \ - $< > $@ - -logout_helper_desktop_in_in_files = \ - indicator-session-lock-screen.desktop.in.in \ - indicator-session-logout.desktop.in.in \ - indicator-session-restart.desktop.in.in \ - indicator-session-shutdown.desktop.in.in - -logout_helperdir = $(datadir)/applications -logout_helper_desktop_files = \ - $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) -logout_helper_DATA = $(logout_helper_desktop_files) - -EXTRA_DIST += \ - $(logout_helper_desktop_in_in_files) - -CLEANFILES += \ - $(logout_helper_desktop_files) -endif diff --git a/data/indicator-session-lock-screen.desktop.in.in b/data/indicator-session-lock-screen.desktop.in.in deleted file mode 100644 index c414402..0000000 --- a/data/indicator-session-lock-screen.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Lock Screen -TryExec=@bindir@/xdg-screensaver -Exec=@bindir@/xdg-screensaver lock -Icon=system-lock-screen -Terminal=false -Type=Application -OnlyShowIn=Unity; -Categories=System; -Version=1.0 diff --git a/data/indicator-session-logout.desktop.in.in b/data/indicator-session-logout.desktop.in.in deleted file mode 100644 index 800324e..0000000 --- a/data/indicator-session-logout.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Log Out -TryExec=@libexecdir@/gtk-logout-helper -Exec=@libexecdir@/gtk-logout-helper --logout -Icon=system-log-out -Terminal=false -Type=Application -OnlyShowIn=Unity; -Categories=System; -Version=1.0 diff --git a/data/indicator-session-restart.desktop.in.in b/data/indicator-session-restart.desktop.in.in deleted file mode 100644 index 51acded..0000000 --- a/data/indicator-session-restart.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Restart -TryExec=@libexecdir@/gtk-logout-helper -Exec=@libexecdir@/gtk-logout-helper --restart -Icon=system-restart -Terminal=false -Type=Application -OnlyShowIn=Unity; -Categories=System; -Version=1.0 diff --git a/data/indicator-session-shutdown.desktop.in.in b/data/indicator-session-shutdown.desktop.in.in deleted file mode 100644 index 4603fd1..0000000 --- a/data/indicator-session-shutdown.desktop.in.in +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -_Name=Shut Down -TryExec=@libexecdir@/gtk-logout-helper -Exec=@libexecdir@/gtk-logout-helper --shutdown -Icon=system-shutdown -Terminal=false -Type=Application -OnlyShowIn=Unity; -Categories=System; -Version=1.0 -- cgit v1.2.3 From 456ec1cfe7c70a3a50854deebf7244f656c3c43a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 4 Apr 2012 12:38:27 -0500 Subject: Dropping the desktop files from translations --- po/POTFILES.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 18b5d9b..03a259c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,10 +1,6 @@ [encoding: UTF-8] data/com.canonical.indicator.session.gschema.xml.in data/extra-sessions/classic-desktop.desktop.in.in -data/indicator-session-lock-screen.desktop.in.in -data/indicator-session-shutdown.desktop.in.in -data/indicator-session-logout.desktop.in.in -data/indicator-session-restart.desktop.in.in src/settings-helper.c src/lock-helper.c src/gtk-logout-helper.c -- cgit v1.2.3 -- cgit v1.2.3 From 1ddba0eb336a87dafc522f15be584ba4cbdc97d5 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 5 Apr 2012 12:41:43 -0500 Subject: 0.3.96 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 21c2939..1ef7d50 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.3.95) +AM_INIT_AUTOMAKE(indicator-session, 0.3.96) AM_MAINTAINER_MODE -- cgit v1.2.3