Skip to contentSkip to conversation

build: Add coverage support

PATCH In review Luiz Augusto von Dentz 2 participants 2 messages Dec 17, 2013

Subsystems (2)
lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

PATCH 1/1 build: Add coverage support

From: Luiz Augusto von Dentz <[email protected]>

Coverage is enabled with --enable-maintainer-mode, 2 new targets are added 'coverage' and 'clean-coverage', the first generate the reports using lcov and depend on the second to cleanup previous generated reports and .gcda files.

---
 .gitignore   |  4 ++++
 Makefile.am  | 18 ++++++++++++++++++
 acinclude.m4 |  4 ++++
 configure.ac |  4 ++++
 4 files changed, 30 insertions(+)
.gitignore +4 -0
index c570728..21dbe26 100644
@@ -3,6 +3,8 @@
 *.lo
 *.la
 *.so
+*.gcno
+*.gcda
 .deps
 .libs
 .dirstamp
@@ -27,7 +29,9 @@ stamp-h1
 autom4te.cache
 test-driver
 test-suite.log
+coverage.info
 
+coverage
 lib/bluez.pc
 lib/bluetooth
 src/builtin.h
Makefile.am +18 -0
index 15cc149..337d849 100644
@@ -331,5 +331,23 @@ lib/bluetooth/%.h: lib/%.h
 	$(AM_V_at)$(MKDIR_P) lib/bluetooth
 	$(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
 
+if MAINTAINER_MODE
+clean-coverage:
+	-find $(top_builddir) -name "*.gcda" -delete
+	@lcov --directory $(top_builddir) --zerocounters
+	$(RM) -r coverage
+
+coverage: clean-coverage check
+	@lcov --compat-libtool --directory $(top_builddir) --capture \
+				--output-file $(top_builddir)/coverage.info
+	$(AM_V_at)$(MKDIR_P) -p coverage
+	@genhtml -o coverage/ $(top_builddir)/coverage.info
+
+clean-local: clean-coverage
+	-find $(top_builddir) -name "*.gcno" -delete
+	$(RM) -r lib/bluetooth
+
+else
 clean-local:
 	$(RM) -r lib/bluetooth
+endif
acinclude.m4 +4 -0
index 2065852..afc7c6d 100644
@@ -51,6 +51,10 @@ AC_DEFUN([MISC_FLAGS], [
 			misc_ldflags="$misc_ldflags -pie"
 		fi
 	])
+	if (test "$USE_MAINTAINER_MODE" = "yes"); then
+		misc_cflags="$misc_cflags --coverage"
+		misc_ldflags="$misc_ldflags --coverage"
+	fi
 	AC_SUBST([MISC_CFLAGS], $misc_cflags)
 	AC_SUBST([MISC_LDFLAGS], $misc_ldflags)
 ])
configure.ac +4 -0
index 18d0b55..4f36355 100644
@@ -252,4 +252,8 @@ AC_ARG_ENABLE(android, AC_HELP_STRING([--enable-android],
 					[enable_android=${enableval}])
 AM_CONDITIONAL(ANDROID, test "${enable_android}" = "yes")
 
+if (test "$USE_MAINTAINER_MODE" = "yes"); then
+	AC_CHECK_PROG([LCOV], [lcov], [yes], AC_MSG_ERROR(lcov is required))
+fi
+
 AC_OUTPUT(Makefile src/bluetoothd.8 lib/bluez.pc)
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Luiz,

Makefile.am lib/bluetooth/%.h: lib/%.h · line 338

Quoted 13 lines · Luiz Augusto von Dentz
Makefile.am +5 -0
index 15cc149..337d849 100644
@@ -331,5 +331,23 @@ lib/bluetooth/%.h: lib/%.h
        $(AM_V_at)$(MKDIR_P) lib/bluetooth
        $(AM_V_GEN)$(LN_S) -f "$(abs_top_builddir)"/$< $@
 
+if MAINTAINER_MODE
+clean-coverage:
+       -find $(top_builddir) -name "*.gcda" -delete
+       @lcov --directory $(top_builddir) --zerocounters
+       $(RM) -r coverage

You may want to remove coverage.info as well.

Makefile.am lib/bluetooth/%.h: lib/%.h · line 343

Quoted 5 lines
Makefile.am +5 -0
+
+coverage: clean-coverage check
+       @lcov --compat-libtool --directory $(top_builddir) --capture \
+                               --output-file $(top_builddir)/coverage.info
+       $(AM_V_at)$(MKDIR_P) -p coverage

MKDIR_P already includes the "-p" option, so it should be "$(AM_V_at)$(MKDIR_P) coverage" above.

Makefile.am lib/bluetooth/%.h: lib/%.h · line 353

Quoted 10 lines
Makefile.am +8 -0
+       @genhtml -o coverage/ $(top_builddir)/coverage.info
+
+clean-local: clean-coverage
+       -find $(top_builddir) -name "*.gcno" -delete
+       $(RM) -r lib/bluetooth
+
+else
 clean-local:
        $(RM) -r lib/bluetooth
+endif

Best Regards,

Signature · 3 lines
Anderson Lizardo
Instituto Nokia de Tecnologia - INdT
Manaus - Brazil