BIND 10 master, updated. cdada0b63865c20370d42715df72d90f8e59e8bb [master] added usual shared library trick for python tests

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Jul 3 18:17:24 UTC 2012


The branch, master has been updated
       via  cdada0b63865c20370d42715df72d90f8e59e8bb (commit)
      from  4b90f2ac3b8de3f1a61d7b5f743f2721c6dd34b3 (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 cdada0b63865c20370d42715df72d90f8e59e8bb
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Jul 3 11:16:15 2012 -0700

    [master] added usual shared library trick for python tests
    
    this should solve test failure on MacOS.  committing at my discretion.

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

Summary of changes:
 src/lib/python/isc/sysinfo/tests/Makefile.am |    7 +++++++
 1 file changed, 7 insertions(+)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/sysinfo/tests/Makefile.am b/src/lib/python/isc/sysinfo/tests/Makefile.am
index 209c71f..a9dc664 100644
--- a/src/lib/python/isc/sysinfo/tests/Makefile.am
+++ b/src/lib/python/isc/sysinfo/tests/Makefile.am
@@ -2,6 +2,12 @@ PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
 PYTESTS = sysinfo_test.py
 EXTRA_DIST = $(PYTESTS)
 
+# If necessary (rare cases), explicitly specify paths to dynamic libraries
+# required by loadable python modules.
+if SET_ENV_LIBRARY_PATH
+LIBRARY_PATH_PLACEHOLDER = $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/log/.libs:$(abs_top_builddir)/src/lib/config/.libs:$(abs_top_builddir)/src/lib/util/.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:
 if ENABLE_PYTHON_COVERAGE
@@ -11,6 +17,7 @@ if ENABLE_PYTHON_COVERAGE
 endif
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
+	$(LIBRARY_PATH_PLACEHOLDER) \
 	PYTHONPATH=$(COMMON_PYTHON_PATH) \
 	$(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
 	done



More information about the bind10-changes mailing list