From 5996de39f38da7d605a999100a6c4a571ad6b66e Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 27 Mar 2012 15:18:20 -0500 Subject: Also cleaning up coverage instrumentation (*.gcno) on clean-local. --- Makefile.am.coverage | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.am.coverage b/Makefile.am.coverage index 9c59b95..2bc3f33 100644 --- a/Makefile.am.coverage +++ b/Makefile.am.coverage @@ -1,14 +1,18 @@ # Coverage targets -.PHONY: clean-gcda \ +.PHONY: clean-gcno clean-gcda \ coverage-html generate-coverage-html clean-coverage-html \ coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr -clean-local: clean-coverage-html 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 -- cgit v1.2.3 From 77386961444d5d06387f3024f2116654f17d3690 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 27 Mar 2012 16:21:31 -0500 Subject: Pedantic name change for gcovr xml results. --- Makefile.am.coverage | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am.coverage b/Makefile.am.coverage index 2bc3f33..fb97747 100644 --- a/Makefile.am.coverage +++ b/Makefile.am.coverage @@ -38,10 +38,10 @@ coverage-gcovr: clean-gcda generate-coverage-gcovr: @echo Generating coverage GCOVR report - $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.gcovr + $(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml clean-coverage-gcovr: clean-gcda - -rm -rf $(top_builddir)/coverage.gcovr + -rm -rf $(top_builddir)/coverage.xml endif # HAVE_GCOVR -- cgit v1.2.3 From 00edffe61a1131953899f2eae35d31e25871fa4c Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Mon, 16 Apr 2012 13:32:10 -0500 Subject: Adjusted enabling tests to Charles suggestion (removed xyes=xyes). --- configure.ac | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a429d17..8261207 100644 --- a/configure.ac +++ b/configure.ac @@ -124,8 +124,21 @@ AC_SUBST(COVERAGE_LDFLAGS) # Google Test framework ########################### -m4_include([m4/gtest.m4]) -CHECK_GTEST +AC_ARG_ENABLE([tests], + [AS_HELP_STRING([--disable-tests], [Disable test scripts and tools (default=auto)])], + [enable_tests=${enableval}], + [enable_tests=auto]) +if test "x$enable_tests" != "xno"; then + m4_include([m4/gtest.m4]) + CHECK_GTEST + if test "x$enable_tests" = "xauto"; then + enable_tests=${have_gtest} + elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then + AC_MSG_ERROR([tests were requested but gtest is not installed.]) + fi +fi +AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"]) + ########################### # Check to see if we're local @@ -229,5 +242,6 @@ Messaging Indicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR + gtest: $enable_tests gcov: $use_gcov ]) -- cgit v1.2.3 From 9b11f86a4b7b2b3f4cb0ee38ba819233cb256e07 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Mon, 16 Apr 2012 13:39:54 -0500 Subject: Removed obsolete testing configure. --- configure.ac | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configure.ac b/configure.ac index 8261207..552b80b 100644 --- a/configure.ac +++ b/configure.ac @@ -76,15 +76,6 @@ AS_IF([test "x$with_gtk" = x3], AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) -########################### -# Test Dependencies -########################### - -AC_ARG_ENABLE([tests], - AC_HELP_STRING([--disable-tests], [Disable test scripts and tools]),, - [enable_tests=auto]) -AM_CONDITIONAL(BUILD_TESTS, test xyes = xyes) - ########################### # Status Provider Deps ########################### @@ -139,7 +130,6 @@ if test "x$enable_tests" != "xno"; then fi AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"]) - ########################### # Check to see if we're local ########################### -- cgit v1.2.3 From 56a4d5f27d805247eb44f29e2d644353cd4f5f15 Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Tue, 17 Apr 2012 10:25:46 -0500 Subject: Clarified tabination. --- configure.ac | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 552b80b..3d3f5ab 100644 --- a/configure.ac +++ b/configure.ac @@ -116,17 +116,17 @@ AC_SUBST(COVERAGE_LDFLAGS) ########################### AC_ARG_ENABLE([tests], - [AS_HELP_STRING([--disable-tests], [Disable test scripts and tools (default=auto)])], - [enable_tests=${enableval}], - [enable_tests=auto]) + [AS_HELP_STRING([--disable-tests], [Disable test scripts and tools (default=auto)])], + [enable_tests=${enableval}], + [enable_tests=auto]) if test "x$enable_tests" != "xno"; then - m4_include([m4/gtest.m4]) - CHECK_GTEST - if test "x$enable_tests" = "xauto"; then - enable_tests=${have_gtest} - elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then - AC_MSG_ERROR([tests were requested but gtest is not installed.]) - fi + m4_include([m4/gtest.m4]) + CHECK_GTEST + if test "x$enable_tests" = "xauto"; then + enable_tests=${have_gtest} + elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then + AC_MSG_ERROR([tests were requested but gtest is not installed.]) + fi fi AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"]) -- cgit v1.2.3