BIND 10 trac1288, updated. 275d091229e914a848408b785f0143541abed6d5 [1288] added LIBRARY_PATH_PLACEHOLDER for libdatasrc to the notify test's Makefile. Also updated the comment because it doesn't appear to be sunstudio specific.
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Nov 14 18:44:23 UTC 2011
The branch, trac1288 has been updated
via 275d091229e914a848408b785f0143541abed6d5 (commit)
via b5553ef764f6c8cb0acea25e14b6e7a6a3a4cd47 (commit)
via bdde86c05963e9d491015e906c1b899609417887 (commit)
from 045c30f0dffebb30ad8862986be435748ed0efb6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 275d091229e914a848408b785f0143541abed6d5
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Nov 14 10:42:53 2011 -0800
[1288] added LIBRARY_PATH_PLACEHOLDER for libdatasrc to the notify test's
Makefile. Also updated the comment because it doesn't appear to be sunstudio
specific.
commit b5553ef764f6c8cb0acea25e14b6e7a6a3a4cd47
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Nov 14 10:40:14 2011 -0800
[1288] cleanup: removed xfrout from the configured processes in MockBob.start_simple()
to be consistent with the boss class.
commit bdde86c05963e9d491015e906c1b899609417887
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Mon Nov 14 10:39:11 2011 -0800
[1288] fixed startup failure for installed environment.
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/bind10_src.py.in | 15 ++++++---------
src/bin/bind10/bob.spec | 2 +-
src/bin/bind10/tests/bind10_test.py.in | 3 +--
src/bin/xfrin/tests/Makefile.am | 2 +-
src/lib/python/isc/bind10/special_component.py | 1 +
src/lib/python/isc/notify/tests/Makefile.am | 3 +++
6 files changed, 13 insertions(+), 13 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10_src.py.in b/src/bin/bind10/bind10_src.py.in
index dc1eca4..cbbaff5 100755
--- a/src/bin/bind10/bind10_src.py.in
+++ b/src/bin/bind10/bind10_src.py.in
@@ -628,7 +628,7 @@ class BoB:
# ... and start
return self.start_process("b10-resolver", resargs, self.c_channel_env)
- def __ld_path_hack(self, env):
+ def __ld_path_hack(self):
# XXX: a quick-hack workaround. xfrin/out will implicitly use
# dynamically loadable data source modules, which will be installed in
# $(libdir).
@@ -644,7 +644,7 @@ class BoB:
# the same as for the libexec path addition
# TODO: Once #1292 is finished, remove this method and the special
# component, use it as normal component.
- c_channel_env = dict(self.c_channel_env)
+ env = dict(self.c_channel_env)
if ADD_LIBEXEC_PATH:
cur_path = os.getenv('DYLD_LIBRARY_PATH')
cur_path = '' if cur_path is None else ':' + cur_path
@@ -653,6 +653,7 @@ class BoB:
cur_path = os.getenv('LD_LIBRARY_PATH')
cur_path = '' if cur_path is None else ':' + cur_path
env['LD_LIBRARY_PATH'] = "@@LIBDIR@@" + cur_path
+ return env
def start_cmdctl(self):
"""
@@ -667,24 +668,20 @@ class BoB:
self.cmdctl_port)
def start_xfrin(self):
- self.__ld_path_hack(c_channel_env)
-
# Set up the command arguments.
args = ['b10-xfrin']
if self.verbose:
args += ['-v']
- return self.start_process("b10-xfrin", args, c_channel_env)
-
- def start_xfrout(self, c_channel_env):
- self.__ld_path_hack(c_channel_env)
+ return self.start_process("b10-xfrin", args, self.__ld_path_hack())
+ def start_xfrout(self):
# Set up the command arguments.
args = ['b10-xfrout']
if self.verbose:
args += ['-v']
- return self.start_process("b10-xfrout", args, c_channel_env)
+ return self.start_process("b10-xfrout", args, self.__ld_path_hack())
def start_all_components(self):
"""
diff --git a/src/bin/bind10/bob.spec b/src/bin/bind10/bob.spec
index 2fffe56..4267b70 100644
--- a/src/bin/bind10/bob.spec
+++ b/src/bin/bind10/bob.spec
@@ -15,7 +15,7 @@
"kind": "dispensable"
},
"b10-xfrin": { "special": "xfrin", "kind": "dispensable" },
- "b10-xfrout": { "special": "Xfrout", "kind": "dispensable" },
+ "b10-xfrout": { "special": "xfrout", "kind": "dispensable" },
"b10-zonemgr": { "address": "Zonemgr", "kind": "dispensable" },
"b10-stats": { "address": "Stats", "kind": "dispensable" },
"b10-stats-httpd": {
diff --git a/src/bin/bind10/tests/bind10_test.py.in b/src/bin/bind10/tests/bind10_test.py.in
index 0aa6778..65e8d6d 100644
--- a/src/bin/bind10/tests/bind10_test.py.in
+++ b/src/bin/bind10/tests/bind10_test.py.in
@@ -274,8 +274,7 @@ class MockBob(BoB):
return procinfo
def start_simple(self, name):
- procmap = { 'b10-xfrout': self.start_xfrout,
- 'b10-zonemgr': self.start_zonemgr,
+ procmap = { 'b10-zonemgr': self.start_zonemgr,
'b10-stats': self.start_stats,
'b10-stats-httpd': self.start_stats_httpd,
'b10-cmdctl': self.start_cmdctl,
diff --git a/src/bin/xfrin/tests/Makefile.am b/src/bin/xfrin/tests/Makefile.am
index 8f4fa91..cffafe1 100644
--- a/src/bin/xfrin/tests/Makefile.am
+++ b/src/bin/xfrin/tests/Makefile.am
@@ -10,7 +10,7 @@ LIBRARY_PATH_PLACEHOLDER =
if SET_ENV_LIBRARY_PATH
LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/cryptolink/.libs:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/cc/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/util/io/.libs:$(abs_top_builddir)/src/lib/datasrc/.libs:$$$(ENV_LIBRARY_PATH)
else
-# sunstudio needs the ds path even if not all paths are necessary
+# Some systems need the ds path even if not all paths are necessary
LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/datasrc/.libs
endif
diff --git a/src/lib/python/isc/bind10/special_component.py b/src/lib/python/isc/bind10/special_component.py
index edf320f..1c8bc64 100644
--- a/src/lib/python/isc/bind10/special_component.py
+++ b/src/lib/python/isc/bind10/special_component.py
@@ -159,6 +159,7 @@ def get_specials():
'cmdctl': CmdCtl,
# FIXME: Temporary workaround before #1292 is done
'xfrin': XfrIn,
+ 'xfrout': XfrOut,
# TODO: Remove when not needed, workaround before sockcreator works
'setuid': SetUID
}
diff --git a/src/lib/python/isc/notify/tests/Makefile.am b/src/lib/python/isc/notify/tests/Makefile.am
index 9b49785..6b62b90 100644
--- a/src/lib/python/isc/notify/tests/Makefile.am
+++ b/src/lib/python/isc/notify/tests/Makefile.am
@@ -12,6 +12,9 @@ EXTRA_DIST += testdata/multisoa.example
LIBRARY_PATH_PLACEHOLDER =
if SET_ENV_LIBRARY_PATH
LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/cryptolink/.libs:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/cc/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/datasrc/.libs:$$$(ENV_LIBRARY_PATH)
+else
+# Some systems need the ds path even if not all paths are necessary
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/datasrc/.libs
endif
# test using command-line arguments, so use check-local target instead of TESTS
More information about the bind10-changes
mailing list