[svn] commit: r3144 - in /branches/trac362/src: bin/cfgmgr/tests/ bin/loadzone/tests/correct/ bin/loadzone/tests/error/ bin/tests/ lib/dns/python/tests/ lib/python/isc/log/tests/ lib/python/isc/utils/tests/

BIND 10 source code commits bind10-changes at lists.isc.org
Fri Oct 8 15:36:49 UTC 2010


Author: jreed
Date: Fri Oct  8 15:36:49 2010
New Revision: 3144

Log:
Update the rest of the makefiles to have them do the python
coverage (if enabled).

Still to do... do make target to generate reports.

Coverage report: 62%


Modified:
    branches/trac362/src/bin/cfgmgr/tests/Makefile.am
    branches/trac362/src/bin/loadzone/tests/correct/Makefile.am
    branches/trac362/src/bin/loadzone/tests/error/Makefile.am
    branches/trac362/src/bin/tests/Makefile.am
    branches/trac362/src/lib/dns/python/tests/Makefile.am
    branches/trac362/src/lib/python/isc/log/tests/Makefile.am
    branches/trac362/src/lib/python/isc/utils/tests/Makefile.am

Modified: branches/trac362/src/bin/cfgmgr/tests/Makefile.am
==============================================================================
--- branches/trac362/src/bin/cfgmgr/tests/Makefile.am (original)
+++ branches/trac362/src/bin/cfgmgr/tests/Makefile.am Fri Oct  8 15:36:49 2010
@@ -1,11 +1,15 @@
+PYCOVERAGE = @PYCOVERAGE@
 PYTESTS = b10-cfgmgr_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/bin/cfgmgr \

Modified: branches/trac362/src/bin/loadzone/tests/correct/Makefile.am
==============================================================================
--- branches/trac362/src/bin/loadzone/tests/correct/Makefile.am (original)
+++ branches/trac362/src/bin/loadzone/tests/correct/Makefile.am Fri Oct  8 15:36:49 2010
@@ -1,3 +1,4 @@
+PYCOVERAGE = @PYCOVERAGE@
 PYTESTS = correct_test.sh
 EXTRA_DIST = get_zonedatas.py
 EXTRA_DIST += include.db
@@ -14,10 +15,13 @@
 EXTRA_DIST += ttlext.db
 EXTRA_DIST += example.db
 
-# 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/loadzone \

Modified: branches/trac362/src/bin/loadzone/tests/error/Makefile.am
==============================================================================
--- branches/trac362/src/bin/loadzone/tests/error/Makefile.am (original)
+++ branches/trac362/src/bin/loadzone/tests/error/Makefile.am Fri Oct  8 15:36:49 2010
@@ -1,3 +1,4 @@
+PYCOVERAGE = @PYCOVERAGE@
 PYTESTS = error_test.sh
 
 EXTRA_DIST = error.known
@@ -14,10 +15,13 @@
 EXTRA_DIST += originerr1.db
 EXTRA_DIST += originerr2.db
 
-# 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/bin/loadzone \

Modified: branches/trac362/src/bin/tests/Makefile.am
==============================================================================
--- branches/trac362/src/bin/tests/Makefile.am (original)
+++ branches/trac362/src/bin/tests/Makefile.am Fri Oct  8 15:36:49 2010
@@ -1,11 +1,15 @@
+PYCOVERAGE = @PYCOVERAGE@
 PYTESTS = process_rename_test.py
 # .py will be generated by configure, so we don't have to include it
 # in EXTRA_DIST.
 
-# 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 \

Modified: branches/trac362/src/lib/dns/python/tests/Makefile.am
==============================================================================
--- branches/trac362/src/lib/dns/python/tests/Makefile.am (original)
+++ branches/trac362/src/lib/dns/python/tests/Makefile.am Fri Oct  8 15:36:49 2010
@@ -1,3 +1,4 @@
+PYCOVERAGE = @PYCOVERAGE@
 PYTESTS = edns_python_test.py
 PYTESTS += message_python_test.py
 PYTESTS += messagerenderer_python_test.py
@@ -21,10 +22,13 @@
 LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
 endif
 
-# 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/dns/.libs:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \

Modified: branches/trac362/src/lib/python/isc/log/tests/Makefile.am
==============================================================================
--- branches/trac362/src/lib/python/isc/log/tests/Makefile.am (original)
+++ branches/trac362/src/lib/python/isc/log/tests/Makefile.am Fri Oct  8 15:36:49 2010
@@ -1,10 +1,14 @@
+PYCOVERAGE = @PYCOVERAGE@
 PYTESTS = log_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 \

Modified: branches/trac362/src/lib/python/isc/utils/tests/Makefile.am
==============================================================================
--- branches/trac362/src/lib/python/isc/utils/tests/Makefile.am (original)
+++ branches/trac362/src/lib/python/isc/utils/tests/Makefile.am Fri Oct  8 15:36:49 2010
@@ -1,10 +1,14 @@
+PYCOVERAGE = @PYCOVERAGE@
 PYTESTS = process_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 \




More information about the bind10-changes mailing list