BIND 10 master, updated. bf9c46a19ba59fa798236b64521fc6d95f18e076 [master] fixed the usual MacOS X regression by setting LIBRARY_PATH_PLACEHOLDER in Makefile.am for python tests.

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Jul 11 18:11:52 UTC 2011


The branch, master has been updated
       via  bf9c46a19ba59fa798236b64521fc6d95f18e076 (commit)
      from  2357e7abc8bac23f60d79ca8abe81854b5550eea (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 bf9c46a19ba59fa798236b64521fc6d95f18e076
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Mon Jul 11 11:10:48 2011 -0700

    [master] fixed the usual MacOS X regression by setting LIBRARY_PATH_PLACEHOLDER
    in Makefile.am for python tests.

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

Summary of changes:
 src/bin/stats/tests/Makefile.am |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/stats/tests/Makefile.am b/src/bin/stats/tests/Makefile.am
index 8163c7f..dad6c48 100644
--- a/src/bin/stats/tests/Makefile.am
+++ b/src/bin/stats/tests/Makefile.am
@@ -4,6 +4,13 @@ PYTESTS = b10-stats_test.py b10-stats-httpd_test.py
 EXTRA_DIST = $(PYTESTS) fake_time.py fake_socket.py fake_select.py
 CLEANFILES = fake_time.pyc fake_socket.pyc fake_select.pyc
 
+# 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/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:$$$(ENV_LIBRARY_PATH)
+endif
+
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local:
 if ENABLE_PYTHON_COVERAGE
@@ -13,6 +20,7 @@ if ENABLE_PYTHON_COVERAGE
 endif
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
+	$(LIBRARY_PATH_PLACEHOLDER) \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/stats:$(abs_top_builddir)/src/bin/stats/tests \
 	B10_FROM_SOURCE=$(abs_top_srcdir) \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \




More information about the bind10-changes mailing list