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



commit 7be1c4668dc6ba40a01c060b7155da1cfc556984
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 c7bf4c8..d1f55f9 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-19  Murray Cumming  <murrayc murrayc com>
 
         Examples: Remove unused list_related_* layouts.
diff --git a/Makefile_tests.am b/Makefile_tests.am
index 6beb3fa..ec3f8c6 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -106,6 +106,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)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]