BIND 10 master, updated. 910caee23c188c5b9575d87bf479d9caa3ab8d07 [master] Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  910caee23c188c5b9575d87bf479d9caa3ab8d07 (commit)
       via  e1bf2fce994c07e02466016d94007e509f2fe478 (commit)
      from  179a2105dc0a9c9341d4347b711b62c2bbb9ccfb (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 910caee23c188c5b9575d87bf479d9caa3ab8d07
Merge: e1bf2fc 179a210
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Jun 15 10:39:09 2011 -0700

    [master] Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit e1bf2fce994c07e02466016d94007e509f2fe478
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Jun 15 10:38:28 2011 -0700

    [master] fixed test error due to missing DYLD path for MacOS.
    patch reviewed on jabber.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/python/isc/log/tests/Makefile.am |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/log/tests/Makefile.am b/src/lib/python/isc/log/tests/Makefile.am
index f2825cb..0eacbb1 100644
--- a/src/lib/python/isc/log/tests/Makefile.am
+++ b/src/lib/python/isc/log/tests/Makefile.am
@@ -2,8 +2,16 @@ PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = log_test.py
 EXTRA_DIST = $(PYTESTS) log_console.py.in console.out check_output.sh
 
+# If necessary (rare cases), explicitly specify paths to dynamic libraries
+# required by loadable python modules.
+LIBRARY_PATH_PLACEHOLDER =
+if SET_ENV_LIBRARY_PATH
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/util/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
+endif
+
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
+	$(LIBRARY_PATH_PLACEHOLDER) \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/python/isc/log \
 	$(abs_srcdir)/check_output.sh $(abs_builddir)/log_console.py $(abs_srcdir)/console.out
 if ENABLE_PYTHON_COVERAGE
@@ -13,6 +21,7 @@ if ENABLE_PYTHON_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 \
+	$(LIBRARY_PATH_PLACEHOLDER) \
+	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/python/isc/log:$(abs_top_builddir)/src/lib/log/python/.libs \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done