[svn] commit: r2771 - in /branches/trac316/src: bin/bind10/tests/ bin/bindctl/tests/ bin/cfgmgr/tests/ bin/cmdctl/tests/ bin/loadzone/ bin/loadzone/tests/correct/ bin/loadzone/tests/error/ bin/msgq/tests/ bin/xfrin/tests/ bin/xfrout/tests/ bin/zonemgr/tests/ lib/dns/python/tests/ lib/python/isc/cc/tests/ lib/python/isc/config/tests/ lib/python/isc/log/tests/ lib/python/isc/notify/tests/
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Aug 20 15:39:42 UTC 2010
Author: jreed
Date: Fri Aug 20 15:39:42 2010
New Revision: 2771
Log:
Exit if a single test script fails.
Also add some comments.
Modified:
branches/trac316/src/bin/bind10/tests/Makefile.am
branches/trac316/src/bin/bindctl/tests/Makefile.am
branches/trac316/src/bin/cfgmgr/tests/Makefile.am
branches/trac316/src/bin/cmdctl/tests/Makefile.am
branches/trac316/src/bin/loadzone/Makefile.am
branches/trac316/src/bin/loadzone/tests/correct/Makefile.am
branches/trac316/src/bin/loadzone/tests/error/Makefile.am
branches/trac316/src/bin/msgq/tests/Makefile.am
branches/trac316/src/bin/xfrin/tests/Makefile.am
branches/trac316/src/bin/xfrout/tests/Makefile.am
branches/trac316/src/bin/zonemgr/tests/Makefile.am
branches/trac316/src/lib/dns/python/tests/Makefile.am
branches/trac316/src/lib/python/isc/cc/tests/Makefile.am
branches/trac316/src/lib/python/isc/config/tests/Makefile.am
branches/trac316/src/lib/python/isc/log/tests/Makefile.am
branches/trac316/src/lib/python/isc/notify/tests/Makefile.am
Modified: branches/trac316/src/bin/bind10/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/bind10/tests/Makefile.am (original)
+++ branches/trac316/src/bin/bind10/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -1,3 +1,4 @@
+#PYTESTS = args_test.py bind10_test.py
PYTESTS = bind10_test.py
EXTRA_DIST = $(PYTESTS)
@@ -8,5 +9,5 @@
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/bind10 \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/bindctl/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/bindctl/tests/Makefile.am (original)
+++ branches/trac316/src/bin/bindctl/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -8,5 +8,5 @@
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_srcdir)/src/bin \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/cfgmgr/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/cfgmgr/tests/Makefile.am (original)
+++ branches/trac316/src/bin/cfgmgr/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -9,5 +9,5 @@
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 \
- $(PYCOVERAGE) $(abs_builddir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_builddir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/cmdctl/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/cmdctl/tests/Makefile.am (original)
+++ branches/trac316/src/bin/cmdctl/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -10,5 +10,5 @@
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cmdctl \
CMDCTL_SPEC_PATH=$(abs_top_builddir)/src/bin/cmdctl \
CMDCTL_SRC_PATH=$(abs_top_srcdir)/src/bin/cmdctl \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/loadzone/Makefile.am
==============================================================================
--- branches/trac316/src/bin/loadzone/Makefile.am (original)
+++ branches/trac316/src/bin/loadzone/Makefile.am Fri Aug 20 15:39:42 2010
@@ -46,5 +46,5 @@
EXTRA_DIST += tests/normal/sql2.example.com.signed
pytest:
- $(SHELL) tests/correct/correct_test.sh
+ $(SHELL) tests/correct/correct_test.sh-NOEXIST
$(SHELL) tests/error/error_test.sh
Modified: branches/trac316/src/bin/loadzone/tests/correct/Makefile.am
==============================================================================
--- branches/trac316/src/bin/loadzone/tests/correct/Makefile.am (original)
+++ branches/trac316/src/bin/loadzone/tests/correct/Makefile.am Fri Aug 20 15:39:42 2010
@@ -1,3 +1,4 @@
+# TODO: this is a not a python script!
PYTESTS = correct_test.sh
EXTRA_DIST = get_zonedatas.py
EXTRA_DIST += include.db
@@ -21,5 +22,5 @@
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 \
- $(SHELL) $(abs_builddir)/$$pytest ; \
+ $(SHELL) $(abs_builddir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/loadzone/tests/error/Makefile.am
==============================================================================
--- branches/trac316/src/bin/loadzone/tests/error/Makefile.am (original)
+++ branches/trac316/src/bin/loadzone/tests/error/Makefile.am Fri Aug 20 15:39:42 2010
@@ -1,3 +1,4 @@
+# TODO: this is not a python script
PYTESTS = error_test.sh
EXTRA_DIST = error.known
@@ -21,5 +22,5 @@
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/bin/loadzone \
- $(SHELL) $(abs_builddir)/$$pytest ; \
+ $(SHELL) $(abs_builddir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/msgq/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/msgq/tests/Makefile.am (original)
+++ branches/trac316/src/bin/msgq/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -8,6 +8,6 @@
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/xfrin/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/xfrin/tests/Makefile.am (original)
+++ branches/trac316/src/bin/xfrin/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -8,5 +8,5 @@
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/xfrout/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/xfrout/tests/Makefile.am (original)
+++ branches/trac316/src/bin/xfrout/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -8,5 +8,5 @@
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/bin/zonemgr/tests/Makefile.am
==============================================================================
--- branches/trac316/src/bin/zonemgr/tests/Makefile.am (original)
+++ branches/trac316/src/bin/zonemgr/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -8,5 +8,5 @@
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/bin/zonemgr:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/lib/dns/python/tests/Makefile.am
==============================================================================
--- branches/trac316/src/lib/dns/python/tests/Makefile.am (original)
+++ branches/trac316/src/lib/dns/python/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -18,5 +18,5 @@
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 \
TESTDATA_PATH=$(abs_top_srcdir)/src/lib/dns/tests/testdata \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/lib/python/isc/cc/tests/Makefile.am
==============================================================================
--- branches/trac316/src/lib/python/isc/cc/tests/Makefile.am (original)
+++ branches/trac316/src/lib/python/isc/cc/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -12,5 +12,5 @@
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
BIND10_TEST_SOCKET_FILE=$(builddir)/test_socket.sock \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/lib/python/isc/config/tests/Makefile.am
==============================================================================
--- branches/trac316/src/lib/python/isc/config/tests/Makefile.am (original)
+++ branches/trac316/src/lib/python/isc/config/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -11,5 +11,5 @@
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/config/testdata \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/lib/python/isc/log/tests/Makefile.am
==============================================================================
--- branches/trac316/src/lib/python/isc/log/tests/Makefile.am (original)
+++ branches/trac316/src/lib/python/isc/log/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -8,5 +8,5 @@
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 ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac316/src/lib/python/isc/notify/tests/Makefile.am
==============================================================================
--- branches/trac316/src/lib/python/isc/notify/tests/Makefile.am (original)
+++ branches/trac316/src/lib/python/isc/notify/tests/Makefile.am Fri Aug 20 15:39:42 2010
@@ -8,5 +8,5 @@
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 ; \
+ $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
done
More information about the bind10-changes
mailing list