[svn] commit: r2914 - in /branches/trac191-rebased/src/bin/stats: stats_stub.py.in tests/Makefile.am

[BIND 10 source code commits]

Author: jelte
Date: Tue Sep 14 12:29:22 2010
New Revision: 2914

Log:
another source vs build directory fix, this time to run the tests

Modified:
    branches/trac191-rebased/src/bin/stats/stats_stub.py.in
    branches/trac191-rebased/src/bin/stats/tests/Makefile.am

Modified: branches/trac191-rebased/src/bin/stats/stats_stub.py.in
==============================================================================
--- branches/trac191-rebased/src/bin/stats/stats_stub.py.in (original)
+++ branches/trac191-rebased/src/bin/stats/stats_stub.py.in Tue Sep 14 12:29:22 2010
@@ -29,8 +29,8 @@
 # If B10_FROM_SOURCE is set in the environment, we use data files
 # from a directory relative to that, otherwise we use the ones
 # installed on the system
-if "B10_FROM_SOURCE" in os.environ:
-    SPECFILE_LOCATION = os.environ["B10_FROM_SOURCE"] + "/src/bin/stats/stats.spec"
+if "B10_FROM_BUILD" in os.environ:
+    SPECFILE_LOCATION = os.environ["B10_FROM_BUILD"] + "/src/bin/stats/stats.spec"
 else:
     PREFIX = "@prefix@"
     DATAROOTDIR = "@datarootdir@"

Modified: branches/trac191-rebased/src/bin/stats/tests/Makefile.am
==============================================================================
--- branches/trac191-rebased/src/bin/stats/tests/Makefile.am (original)
+++ branches/trac191-rebased/src/bin/stats/tests/Makefile.am Tue Sep 14 12:29:22 2010
@@ -8,7 +8,7 @@
 check-local:
 	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_srcdir)/src/bin/stats \
+	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/stats \
 	B10_FROM_SOURCE=$(abs_top_srcdir) \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest ; \
 	done