summaryrefslogtreecommitdiffstats
path: root/bindings
diff options
context:
space:
mode:
authornicholas <nicholas@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2007-03-26 14:10:33 +0000
committernicholas <nicholas@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2007-03-26 14:10:33 +0000
commit05d2120359e442780f08f4e63e5d2dcba6c0267f (patch)
tree790e911f607abc32be37b189caba1643016ce840 /bindings
parent16f2c7bcbb7446d079bcff3efde3e85433629d8b (diff)
downloadlibgpod-05d2120359e442780f08f4e63e5d2dcba6c0267f.tar.gz
libgpod-05d2120359e442780f08f4e63e5d2dcba6c0267f.tar.xz
libgpod-05d2120359e442780f08f4e63e5d2dcba6c0267f.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
Diffstat (limited to 'bindings')
-rw-r--r--bindings/python/Makefile.am4
-rw-r--r--bindings/python/tests/tests.py3
2 files changed, 4 insertions, 3 deletions
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()