From c0ac60b8fc5a146e22412d90ba7f2a38d99c157b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballogy@freestart.hu>
Date: Sun, 20 Nov 2011 02:17:19 +0100
Subject: Make building tests optional

---
 Makefile.am | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 3bd312e..807cad0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,17 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS = \
 	libindicator \
-	tests \
 	tools
 
-tests: libindicator
-
 tools: libindicator
 
+if WANT_TESTS
+SUBDIRS += \
+	tests
+
+tests: libindicator
+endif
+
 DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations
 
 DISTCLEANFILES = \
-- 
cgit v1.2.3


From b1aebe568a4f0d0d76e9ea32df47385b26b45c5d Mon Sep 17 00:00:00 2001
From: Allan LeSage <allanlesage@gmail.com>
Date: Tue, 6 Dec 2011 15:21:45 -0600
Subject: Added coverage reporting via gcov config and targets.

---
 Makefile.am | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 3bd312e..1cb279e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,3 +40,38 @@ dist-hook:
 			echo Failed to generate AUTHORS: not a branch >&2; \
 	fi
 
+
+# Coverage targets
+
+.PHONY: clean-gcda
+clean-gcda:
+	@echo Removing old coverage results
+	-find -name '*.gcda' -print | xargs -r rm
+
+.PHONY: coverage-html generate-coverage-html clean-coverage-html
+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
+
+.PHONY: coverage-xml generate-coverage-xml clean-coverage-xml
+coverage-xml: clean-gcda
+	-$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-xml
+
+generate-coverage-xml:
+	@echo Generating coverage XML report
+	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
+
+clean-coverage-xml: clean-gcda
+	-rm -rf $(top_builddir)/coverage.xml
+
+clean-local: clean-coverage-html clean-coverage-xml
-- 
cgit v1.2.3