[svn] commit: r1760 - in /branches/trac153/src/bin: bind10/tests/Makefile.am msgq/tests/Makefile.am xfrin/tests/Makefile.am xfrout/tests/Makefile.am

[BIND 10 source code commits]

Author: jreed
Date: Tue Apr 20 22:09:14 2010
New Revision: 1760

Log:
Use abs_top_builddir instead of abs_top_srcdir for some PYTHONPATHs.

For xfrin, make sure EXTRA_DIST is defined outside of the
HAVE_BOOST_PYTHON check.

Modified:
    branches/trac153/src/bin/bind10/tests/Makefile.am
    branches/trac153/src/bin/msgq/tests/Makefile.am
    branches/trac153/src/bin/xfrin/tests/Makefile.am
    branches/trac153/src/bin/xfrout/tests/Makefile.am

Modified: branches/trac153/src/bin/bind10/tests/Makefile.am
==============================================================================
--- branches/trac153/src/bin/bind10/tests/Makefile.am (original)
+++ branches/trac153/src/bin/bind10/tests/Makefile.am Tue Apr 20 22:09:14 2010
@@ -7,6 +7,6 @@
 check-local:
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
-	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/bin/bind10 \
+	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done

Modified: branches/trac153/src/bin/msgq/tests/Makefile.am
==============================================================================
--- branches/trac153/src/bin/msgq/tests/Makefile.am (original)
+++ branches/trac153/src/bin/msgq/tests/Makefile.am Tue Apr 20 22:09:14 2010
@@ -7,7 +7,7 @@
 check-local:
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
-	env PYTHONPATH=$(abs_top_srcdir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python \
+	env PYTHONPATH=$(abs_top_builddir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done
 

Modified: branches/trac153/src/bin/xfrin/tests/Makefile.am
==============================================================================
--- branches/trac153/src/bin/xfrin/tests/Makefile.am (original)
+++ branches/trac153/src/bin/xfrin/tests/Makefile.am Tue Apr 20 22:09:14 2010
@@ -1,7 +1,7 @@
-if HAVE_BOOST_PYTHON
-
 PYTESTS = xfrin_test.py
 EXTRA_DIST = $(PYTESTS)
+
+if HAVE_BOOST_PYTHON
 
 # later will have configure option to choose this, like: coverage run --branch
 PYCOVERAGE = $(PYTHON)
@@ -9,7 +9,7 @@
 check-local:
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
-	env PYTHONPATH=$(abs_top_srcdir)/src/lib/dns/.libs:$(abs_top_srcdir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python \
+	env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done
 

Modified: branches/trac153/src/bin/xfrout/tests/Makefile.am
==============================================================================
--- branches/trac153/src/bin/xfrout/tests/Makefile.am (original)
+++ branches/trac153/src/bin/xfrout/tests/Makefile.am Tue Apr 20 22:09:14 2010
@@ -9,7 +9,7 @@
 check-local:
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
-	env PYTHONPATH=$(abs_top_srcdir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_srcdir)/src/lib/dns/.libs:$(abs_top_srcdir)/src/lib/xfr/.libs \
+	env PYTHONPATH=$(abs_top_builddir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done