diff options
| author | Nicholas Piper <nicholas@users.sourceforge.net> | 2007-03-26 14:10:33 +0000 |
|---|---|---|
| committer | Nicholas Piper <nicholas@users.sourceforge.net> | 2007-03-26 14:10:33 +0000 |
| commit | 09a2bddedaec25e302523ab3d26c9c3d4c9b5b59 (patch) | |
| tree | 790e911f607abc32be37b189caba1643016ce840 | |
| parent | 90f359a4fa87cce3f3ce18b3498c674fd15a49f6 (diff) | |
| download | libgpod-tmz-09a2bddedaec25e302523ab3d26c9c3d4c9b5b59.tar.gz libgpod-tmz-09a2bddedaec25e302523ab3d26c9c3d4c9b5b59.tar.xz libgpod-tmz-09a2bddedaec25e302523ab3d26c9c3d4c9b5b59.zip | |
Use build-tree libraries for Python test, not the installed set.
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1411 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bindings/python/Makefile.am | 4 | ||||
| -rw-r--r-- | bindings/python/tests/tests.py | 3 | ||||
| -rw-r--r-- | configure.ac | 1 |
4 files changed, 13 insertions, 3 deletions
@@ -1,5 +1,13 @@ 2007-03-26 Nicholas Piper <nicholas at users.sourceforge.net> + * bindings/python/Makefile.am + bindings/python/tests/Makefile.am + bindings/python/tests/tests.py: Causes tests to run with the + libraries from the build tree rather than currently installed + version (Todd Zullinger) + +2007-03-26 Nicholas Piper <nicholas at users.sourceforge.net> + * bindings/python/gpod.i.in: Add basic PhotoDB reading facility 2007-03-25 Jorg Schuler <jcsjcs at users.sourceforge.net> diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am index 0951303..ed12adc 100644 --- a/bindings/python/Makefile.am +++ b/bindings/python/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = examples +SUBDIRS = examples tests EXTRA_DIST = \ README.in \ @@ -59,5 +59,5 @@ gpod.py: $(SWIG_INTERFACES) $(SWIG) -python -o $@ $< test: - cd tests && python tests.py + $(MAKE) -C tests test endif diff --git a/bindings/python/tests/tests.py b/bindings/python/tests/tests.py index 474b6a1..c402ac1 100644 --- a/bindings/python/tests/tests.py +++ b/bindings/python/tests/tests.py @@ -1,9 +1,10 @@ import unittest -import gpod import shutil import tempfile import os +gpod = __import__('__init__') + class TestiPodFunctions(unittest.TestCase): def setUp(self): self.mp = tempfile.mkdtemp() diff --git a/configure.ac b/configure.ac index 0a1409a..1e8d31f 100644 --- a/configure.ac +++ b/configure.ac @@ -170,6 +170,7 @@ bindings/Makefile bindings/python/gpod.i bindings/python/Makefile bindings/python/examples/Makefile +bindings/python/tests/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml |