[svn] commit: r3769 - /branches/trac362/Makefile.am

[BIND 10 source code commits]

Author: jreed
Date: Wed Dec  8 17:55:49 2010
New Revision: 3769

Log:
Don't "exit 1" if not configured for code coverage.

Use builddir for the coverage reports.

Print location of the generated reports.

Change directory names for the generated reports to:
coverage-python-html
coverage-cpp-html

Modified:
    branches/trac362/Makefile.am

Modified: branches/trac362/Makefile.am
==============================================================================
--- branches/trac362/Makefile.am (original)
+++ branches/trac362/Makefile.am Wed Dec  8 17:55:49 2010
@@ -15,7 +15,6 @@
 	else \
 		echo "C++ code coverage not enabled at configuration time." ; \
 		echo "Use: ./configure --with-lcov" ; \
-		exit 1; \
 	fi
 
 clean-python-coverage:
@@ -25,7 +24,6 @@
 	else \
 		echo "Python code coverage not enabled at configuration time." ; \
 		echo "Use: ./configure --with-pycoverage" ; \
-		exit 1; \
 	fi
 
 perform-coverage: check
@@ -49,20 +47,20 @@
 			\*_unittest.cc \
 			\*_unittests.h \
 			--output report.info ; \
-		$(GENHTML) -o coverage report.info ; \
+		$(GENHTML) -o $(abs_top_builddir)/coverage-cpp-html report.info ; \
+		echo "Generated C++ Code Coverage report in HTML at $(abs_top_builddir)/coverage-cpp-html" ; \
 	else \
 		echo "C++ code coverage not enabled at configuration time." ; \
 		echo "Use: ./configure --with-lcov" ; \
-		exit 1; \
 	fi
 
 report-python-coverage:
 	@if [ $(USE_PYCOVERAGE) = yes ] ; then \
-		$(PYCOVERAGE) html -d py-coverage-html --omit=src/bin/bind10/tests/,src/bin/bindctl/tests/,src/bin/cfgmgr/tests/,src/bin/cmdctl/tests/,src/bin/loadzone/tests/,src/bin/msgq/tests/,src/bin/stats/tests/,src/bin/tests/,src/bin/xfrin/tests/,src/bin/xfrout/tests/,src/bin/zonemgr/tests/,src/lib/dns/python/tests/,src/lib/dns/tests/,src/lib/python/isc/cc/tests/,src/lib/python/isc/config/tests/,src/lib/python/isc/datasrc/tests/,src/lib/python/isc/log/tests/,src/lib/python/isc/net/tests/,src/lib/python/isc/notify/tests/,src/lib/python/isc/util/tests/ ; \
+		$(PYCOVERAGE) html -d $(abs_top_builddir)/coverage-python-html --omit=src/bin/bind10/tests/,src/bin/bindctl/tests/,src/bin/cfgmgr/tests/,src/bin/cmdctl/tests/,src/bin/loadzone/tests/,src/bin/msgq/tests/,src/bin/stats/tests/,src/bin/tests/,src/bin/xfrin/tests/,src/bin/xfrout/tests/,src/bin/zonemgr/tests/,src/lib/dns/python/tests/,src/lib/dns/tests/,src/lib/python/isc/cc/tests/,src/lib/python/isc/config/tests/,src/lib/python/isc/datasrc/tests/,src/lib/python/isc/log/tests/,src/lib/python/isc/net/tests/,src/lib/python/isc/notify/tests/,src/lib/python/isc/util/tests/ ; \
+		echo "Generated Python Code Coverage report in HTML at $(abs_top_builddir)/coverage-python-html" ; \
 	else \
 		echo "Python code coverage not enabled at configuration time." ; \
 		echo "Use: ./configure --with-pycoverage" ; \
-		exit 1; \
 	fi
 
 # for python and c++ test coverage