diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-01-23 08:55:12 -0600 |
commit | 95daf102dac37a69686f8a86bf7fe47cd442c7d6 (patch) | |
tree | 3891a7075873c6eeb320fe0c8a572ca14655f5af /Makefile.am | |
parent | 4f4190f71f8495e5bcf6779d73157931572e42ac (diff) | |
parent | 1cf6a9761db8beefc8d2a73c2cf9903264424c66 (diff) | |
download | libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.gz libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.tar.bz2 libayatana-indicator-95daf102dac37a69686f8a86bf7fe47cd442c7d6.zip |
"bzr merge lp:indicator" + conflict resolution in tests suite
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 3bd312e..182cb2d 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 = \ @@ -40,3 +44,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 |