Merge lp:~allanlesage/indicator-messages/TDD into lp:indicator-messages/0.3

[Product Strategy Coverity Bug Uploader]

Changes revised under Charles' direction; Charles I've one diff beyond yours, removing an obsolete configuration, would you verify that this is correct please?

[Charles Kerr (charlesk)]

Allan, I don't usually worry about indentation but the indentation in this patch is actively confusing... it looks like a "fi" is missing but isn't. Could you line up the if..elif..fi statements with each other?

review: Needs Fixing

[lp:~allanlesage/indicator-messages/TDD]

260. By Allan LeSage on 2012-04-17

Clarified tabination.

[Allan LeSage (allanlesage)]

Justly retabinated, thanks Charles for your review.

[Charles Kerr (charlesk)]

Thanks Allan :)

review: Approve

=== modified file 'Makefile.am.coverage'
--- Makefile.am.coverage	2012-03-19 18:02:04 +0000
+++ Makefile.am.coverage	2012-04-17 15:28:18 +0000
@@ -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
@@ -34,10 +38,10 @@
 	
 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
 

=== modified file 'configure.ac'
--- configure.ac	2012-04-11 16:00:45 +0000
+++ configure.ac	2012-04-17 15:28:18 +0000
@@ -77,15 +77,6 @@
 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
 ###########################
 
@@ -124,8 +115,20 @@
 # 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 +232,6 @@
 
 	Prefix:        $prefix
 	Indicator Dir: $INDICATORDIR
+	gtest:         $enable_tests
 	gcov:          $use_gcov
 ])