[svn] commit: r2049 - in /branches/trac223: ./ src/bin/bind10/tests/ src/bin/bindctl/tests/ src/bin/cmdctl/tests/ src/bin/msgq/ src/bin/msgq/tests/ src/bin/xfrin/tests/ src/bin/xfrout/tests/ src/lib/python/isc/cc/ src/lib/python/isc/cc/tests/ src/lib/python/isc/config/tests/
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jun 2 11:53:23 UTC 2010
Author: jelte
Date: Wed Jun 2 11:53:23 2010
New Revision: 2049
Log:
add an isc_config.py 'module' for paths and possibly other configure-time variables (currently only BIND10_MSGQ_SOCKET_FILE, and currently only used in lib/python/isc/cc/session.py)
Added:
branches/trac223/src/lib/python/isc/cc/session.py
- copied, changed from r2048, branches/trac223/src/lib/python/isc/cc/session.py.in
Removed:
branches/trac223/src/lib/python/isc/cc/session.py.in
Modified:
branches/trac223/configure.ac
branches/trac223/src/bin/bind10/tests/Makefile.am
branches/trac223/src/bin/bindctl/tests/Makefile.am
branches/trac223/src/bin/cmdctl/tests/Makefile.am
branches/trac223/src/bin/msgq/msgq.py.in
branches/trac223/src/bin/msgq/tests/Makefile.am
branches/trac223/src/bin/xfrin/tests/Makefile.am
branches/trac223/src/bin/xfrout/tests/Makefile.am
branches/trac223/src/lib/python/isc/cc/tests/Makefile.am
branches/trac223/src/lib/python/isc/config/tests/Makefile.am
Modified: branches/trac223/configure.ac
==============================================================================
--- branches/trac223/configure.ac (original)
+++ branches/trac223/configure.ac Wed Jun 2 11:53:23 2010
@@ -448,7 +448,7 @@
src/lib/python/isc/config/tests/config_test
src/lib/python/isc/cc/tests/cc_test
src/lib/dns/gen-rdatacode.py
- src/lib/python/isc/cc/session.py
+ src/lib/python/isc_config.py
src/lib/dns/tests/testdata/gen-wiredata.py
src/lib/cc/session_config.h.pre
], [
Modified: branches/trac223/src/bin/bind10/tests/Makefile.am
==============================================================================
--- branches/trac223/src/bin/bind10/tests/Makefile.am (original)
+++ branches/trac223/src/bin/bind10/tests/Makefile.am Wed Jun 2 11:53:23 2010
@@ -7,6 +7,6 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: branches/trac223/src/bin/bindctl/tests/Makefile.am
==============================================================================
--- branches/trac223/src/bin/bindctl/tests/Makefile.am (original)
+++ branches/trac223/src/bin/bindctl/tests/Makefile.am Wed Jun 2 11:53:23 2010
@@ -7,6 +7,6 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_srcdir)/src/bin \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: branches/trac223/src/bin/cmdctl/tests/Makefile.am
==============================================================================
--- branches/trac223/src/bin/cmdctl/tests/Makefile.am (original)
+++ branches/trac223/src/bin/cmdctl/tests/Makefile.am Wed Jun 2 11:53:23 2010
@@ -7,6 +7,6 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/bin/cmdctl \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cmdctl \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: branches/trac223/src/bin/msgq/msgq.py.in
==============================================================================
--- branches/trac223/src/bin/msgq/msgq.py.in (original)
+++ branches/trac223/src/bin/msgq/msgq.py.in Wed Jun 2 11:53:23 2010
@@ -144,9 +144,7 @@
if os.path.exists(self.socket_file):
os.remove(self.socket_file)
try:
- print("[XX] SOCKET FILE: " + self.socket_file)
self.listen_socket.bind(self.socket_file)
- print("[XX] LISTENING ON SOCKET FILE: " + self.socket_file)
self.listen_socket.listen(1024)
except Exception as e:
# remove the file again if something goes wrong
Modified: branches/trac223/src/bin/msgq/tests/Makefile.am
==============================================================================
--- branches/trac223/src/bin/msgq/tests/Makefile.am (original)
+++ branches/trac223/src/bin/msgq/tests/Makefile.am Wed Jun 2 11:53:23 2010
@@ -7,7 +7,7 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_builddir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python \
+ env PYTHONPATH=$(abs_top_builddir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: branches/trac223/src/bin/xfrin/tests/Makefile.am
==============================================================================
--- branches/trac223/src/bin/xfrin/tests/Makefile.am (original)
+++ branches/trac223/src/bin/xfrin/tests/Makefile.am Wed Jun 2 11:53:23 2010
@@ -9,7 +9,7 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python \
+ env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: branches/trac223/src/bin/xfrout/tests/Makefile.am
==============================================================================
--- branches/trac223/src/bin/xfrout/tests/Makefile.am (original)
+++ branches/trac223/src/bin/xfrout/tests/Makefile.am Wed Jun 2 11:53:23 2010
@@ -9,7 +9,7 @@
check-local:
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/dns/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
+ 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/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: branches/trac223/src/lib/python/isc/cc/tests/Makefile.am
==============================================================================
--- branches/trac223/src/lib/python/isc/cc/tests/Makefile.am (original)
+++ branches/trac223/src/lib/python/isc/cc/tests/Makefile.am Wed Jun 2 11:53:23 2010
@@ -10,6 +10,6 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python \
+ env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
done
Modified: branches/trac223/src/lib/python/isc/config/tests/Makefile.am
==============================================================================
--- branches/trac223/src/lib/python/isc/config/tests/Makefile.am (original)
+++ branches/trac223/src/lib/python/isc/config/tests/Makefile.am Wed Jun 2 11:53:23 2010
@@ -9,7 +9,7 @@
check-local:
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python \
+ 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 ; \
done
More information about the bind10-changes
mailing list