[svn] commit: r3626 - in /branches/trac362: Makefile.am src/bin/stats/tests/Makefile.am src/lib/python/isc/datasrc/tests/Makefile.am src/lib/python/isc/net/tests/Makefile.am src/lib/python/isc/util/tests/Makefile.am

[BIND 10 source code commits]

Author: jreed
Date: Tue Nov 23 14:55:25 2010
New Revision: 3626

Log:
Add more python coverage targets (due to merge from trunk).
Also omit more directories.

Modified:
    branches/trac362/Makefile.am
    branches/trac362/src/bin/stats/tests/Makefile.am
    branches/trac362/src/lib/python/isc/datasrc/tests/Makefile.am
    branches/trac362/src/lib/python/isc/net/tests/Makefile.am
    branches/trac362/src/lib/python/isc/util/tests/Makefile.am

Modified: branches/trac362/Makefile.am
==============================================================================
--- branches/trac362/Makefile.am (original)
+++ branches/trac362/Makefile.am Tue Nov 23 14:55:25 2010
@@ -44,7 +44,7 @@
 
 report-python-coverage:
 	@if [ $(USE_PYCOVERAGE) = yes ] ; then \
-		$(PYCOVERAGE) html -d py-coverage-html --omit=src/lib/python/isc/config/tests,src/bin/bind10/tests,src/bin/bindctl/tests/,src/bin/cfgmgr/tests/,src/bin/cmdctl/tests/,src/bin/msgq/tests/,src/bin/tests/,src/bin/xfrin/tests/,src/bin/xfrout/tests/,src/bin/zonemgr/tests/,src/lib/dns/python/tests/,src/lib/python/isc/cc/tests/,src/lib/python/isc/log/tests/,src/lib/python/isc/utils/tests/,src/lib/python/isc/notify/tests ; \
+		$(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/ ; \
 	fi
 
 # for python and c++ test coverage

Modified: branches/trac362/src/bin/stats/tests/Makefile.am
==============================================================================
--- branches/trac362/src/bin/stats/tests/Makefile.am (original)
+++ branches/trac362/src/bin/stats/tests/Makefile.am Tue Nov 23 14:55:25 2010
@@ -1,15 +1,19 @@
 SUBDIRS = isc testdata
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = b10-stats_test.py b10-stats_stub_test.py
 EXTRA_DIST = $(PYTESTS) fake_time.py
 CLEANFILES = fake_time.pyc
 
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
+if ENABLE_PYTHON_COVERAGE
+	touch $(abs_top_srcdir)/.coverage 
+	rm -f .coverage
+	${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/stats:$(abs_top_builddir)/src/bin/stats/tests \
 	B10_FROM_BUILD=$(abs_top_builddir) \
-	$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done

Modified: branches/trac362/src/lib/python/isc/datasrc/tests/Makefile.am
==============================================================================
--- branches/trac362/src/lib/python/isc/datasrc/tests/Makefile.am (original)
+++ branches/trac362/src/lib/python/isc/datasrc/tests/Makefile.am Tue Nov 23 14:55:25 2010
@@ -1,12 +1,16 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = master_test.py
 EXTRA_DIST = $(PYTESTS)
 
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
+if ENABLE_PYTHON_COVERAGE
+	touch $(abs_top_srcdir)/.coverage 
+	rm -f .coverage
+	${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/python/isc/log \
-	$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done

Modified: branches/trac362/src/lib/python/isc/net/tests/Makefile.am
==============================================================================
--- branches/trac362/src/lib/python/isc/net/tests/Makefile.am (original)
+++ branches/trac362/src/lib/python/isc/net/tests/Makefile.am Tue Nov 23 14:55:25 2010
@@ -1,12 +1,16 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = addr_test.py parse_test.py
 EXTRA_DIST = $(PYTESTS)
 
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
+if ENABLE_PYTHON_COVERAGE
+	touch $(abs_top_srcdir)/.coverage 
+	rm -f .coverage
+	${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
-	$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done

Modified: branches/trac362/src/lib/python/isc/util/tests/Makefile.am
==============================================================================
--- branches/trac362/src/lib/python/isc/util/tests/Makefile.am (original)
+++ branches/trac362/src/lib/python/isc/util/tests/Makefile.am Tue Nov 23 14:55:25 2010
@@ -1,12 +1,16 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = process_test.py socketserver_mixin_test.py
 EXTRA_DIST = $(PYTESTS)
 
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
+if ENABLE_PYTHON_COVERAGE
+	touch $(abs_top_srcdir)/.coverage 
+	rm -f .coverage
+	${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
-	$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done