[svn] commit: r2779 - in /branches/trac313/src: bin/xfrin/tests/Makefile.am bin/xfrout/tests/Makefile.am lib/dns/python/tests/Makefile.am lib/python/isc/notify/tests/Makefile.am

Fri Aug 20 21:21:58 UTC 2010

Author: jinmei
Date: Fri Aug 20 21:21:58 2010
New Revision: 2779

Log:
s/B10_LIBRARY_PATH/LIBRARY_PATH_PLACEHOLDER/ hoping the latter is less confusing

Modified:
    branches/trac313/src/bin/xfrin/tests/Makefile.am
    branches/trac313/src/bin/xfrout/tests/Makefile.am
    branches/trac313/src/lib/dns/python/tests/Makefile.am
    branches/trac313/src/lib/python/isc/notify/tests/Makefile.am

Modified: branches/trac313/src/bin/xfrin/tests/Makefile.am
==============================================================================

--- branches/trac313/src/bin/xfrin/tests/Makefile.am (original)
+++ branches/trac313/src/bin/xfrin/tests/Makefile.am Fri Aug 20 21:21:58 2010
@@ -3,9 +3,9 @@
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
 # required by loadable python modules.
-B10_LIBRARY_PATH =
+LIBRARY_PATH_PLACEHOLDER =
 if SET_ENV_LIBRARY_PATH
-B10_LIBRARY_PATH += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/xfr/.libs:$$$(ENV_LIBRARY_PATH)
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/xfr/.libs:$$$(ENV_LIBRARY_PATH)
 endif
 
 # later will have configure option to choose this, like: coverage run --branch
@@ -15,6 +15,6 @@
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
-	$(B10_LIBRARY_PATH) \
+	$(LIBRARY_PATH_PLACEHOLDER) \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done

Modified: branches/trac313/src/bin/xfrout/tests/Makefile.am
==============================================================================
--- branches/trac313/src/bin/xfrout/tests/Makefile.am (original)
+++ branches/trac313/src/bin/xfrout/tests/Makefile.am Fri Aug 20 21:21:58 2010
@@ -3,9 +3,9 @@
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
 # required by loadable python modules.
-B10_LIBRARY_PATH =
+LIBRARY_PATH_PLACEHOLDER =
 if SET_ENV_LIBRARY_PATH
-B10_LIBRARY_PATH += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/xfr/.libs:$$$(ENV_LIBRARY_PATH)
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/xfr/.libs:$$$(ENV_LIBRARY_PATH)
 endif
 
 # later will have configure option to choose this, like: coverage run --branch
@@ -15,6 +15,6 @@
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_builddir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
-	$(B10_LIBRARY_PATH) \
+	$(LIBRARY_PATH_PLACEHOLDER) \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done

Modified: branches/trac313/src/lib/dns/python/tests/Makefile.am
==============================================================================
--- branches/trac313/src/lib/dns/python/tests/Makefile.am (original)
+++ branches/trac313/src/lib/dns/python/tests/Makefile.am Fri Aug 20 21:21:58 2010
@@ -12,9 +12,9 @@
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
 # required by loadable python modules.
-B10_LIBRARY_PATH =
+LIBRARY_PATH_PLACEHOLDER =
 if SET_ENV_LIBRARY_PATH
-B10_LIBRARY_PATH += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
 endif
 
 # later will have configure option to choose this, like: coverage run --branch
@@ -25,6 +25,6 @@
 	echo Running test: $$pytest ; \
 	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
 	TESTDATA_PATH=$(abs_top_srcdir)/src/lib/dns/tests/testdata \
-	$(B10_LIBRARY_PATH) \
+	$(LIBRARY_PATH_PLACEHOLDER) \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done

Modified: branches/trac313/src/lib/python/isc/notify/tests/Makefile.am
==============================================================================
--- branches/trac313/src/lib/python/isc/notify/tests/Makefile.am (original)
+++ branches/trac313/src/lib/python/isc/notify/tests/Makefile.am Fri Aug 20 21:21:58 2010
@@ -3,9 +3,9 @@
 
 # If necessary (rare cases), explicitly specify paths to dynamic libraries
 # required by loadable python modules.
-B10_LIBRARY_PATH =
+LIBRARY_PATH_PLACEHOLDER =
 if SET_ENV_LIBRARY_PATH
-B10_LIBRARY_PATH += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
+LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
 endif
 
 # later will have configure option to choose this, like: coverage run --branch
@@ -15,6 +15,6 @@
 	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/dns/python/.libs \
-	$(B10_LIBRARY_PATH) \
+	$(LIBRARY_PATH_PLACEHOLDER) \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done


