[glom/glom-1-22] Tests: Use the locally-built python module.

[Murray Cumming <murrayc src gnome org>]

commit d4b6bba31558e641318997d5025a20783c7c0187
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Nov 22 11:26:29 2012 +0100

    Tests: Use the locally-built python module.
    
            * Makefile_tests.am: Set the PYTHONPATH in
    automake's TESTS_ENVIRONMENT variable
    to fix make check before make install has run,
    and generally to be a correct check.

 ChangeLog         |    9 +++++++++
 Makefile_tests.am |    5 +++++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c398cbf..683016d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-11-22  Murray Cumming  <murrayc murrayc com>
+
+        Tests: Use the locally-built python module.
+
+        * Makefile_tests.am: Set the PYTHONPATH in
+       automake's TESTS_ENVIRONMENT variable
+       to fix make check before make install has run,
+       and generally to be a correct check.
+
 2012-11-08  Murray Cumming  <murrayc murrayc com>
 
        Import example .po translations into the examples.
diff --git a/Makefile_tests.am b/Makefile_tests.am
index 67420ea..ed7af35 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -104,6 +104,11 @@ dist_noinst_SCRIPTS = tests/test_dtd_file_validation.sh \
 
 #TESTS_ENVIRONMENT=which valgrind && valgrind --tool=memcheck --leak-check=full --leak-resolution=high 
--trace-children=yes --num-callers=30
 
+# Tell python to use the python modules that we have built,
+# instead of just looking in the installed paths,
+# so the test can run before installation::
+TESTS_ENVIRONMENT = PYTHONPATH=${PYTHONPATH}:$(abs_top_builddir)/glom/python_embed/python_module/.libs
+
 tests_ldadd = glom/libglom/libglom-$(GLOM_ABI_VERSION).la $(libglom_all_libs)
 tests_cppflags = $(glom_includes) $(LIBGLOM_CFLAGS) $(PYTHON_CPPFLAGS) $(BOOST_PYTHON_CFLAGS) $(glom_defines)
 tests_cppflags_ui = $(glom_includes) $(GLOM_CFLAGS) $(PYTHON_CPPFLAGS) $(BOOST_PYTHON_CFLAGS) $(glom_defines)