BIND 10 master, updated. 00d06904569e27ba56975b60906022585a43ab4e [master] (re)add the LIBRARY_PATH_PLACEHOLDER trick for dhcp6 tests

[BIND 10 source code commits]

The branch, master has been updated
       via  00d06904569e27ba56975b60906022585a43ab4e (commit)
      from  a45a2bd0f8fdaf0484ab88797775f61f85cd9a03 (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 00d06904569e27ba56975b60906022585a43ab4e
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue May 29 09:50:30 2012 -0700

    [master] (re)add the LIBRARY_PATH_PLACEHOLDER trick for dhcp6 tests
    
    now its python test relies on isc python modules we need this workaround
    for MacOS X.  This fix solves recent buildbot failures on macmini.
    okayed on jabber

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

Summary of changes:
 src/bin/dhcp6/tests/Makefile.am |    8 ++++++++
 1 file changed, 8 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/Makefile.am b/src/bin/dhcp6/tests/Makefile.am
index 2fce36e..d216f53 100644
--- a/src/bin/dhcp6/tests/Makefile.am
+++ b/src/bin/dhcp6/tests/Makefile.am
@@ -2,10 +2,18 @@ PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = dhcp6_test.py
 EXTRA_DIST = $(PYTESTS)
 
+# 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/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)
+endif
+
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
+	$(LIBRARY_PATH_PLACEHOLDER) \
 	PYTHONPATH=$(COMMON_PYTHON_PATH):$(abs_top_srcdir)/src/bin:$(abs_top_builddir)/src/bin/bind10:$(abs_top_builddir)/src/lib/util/io/.libs \
 		$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done