From 09a2bddedaec25e302523ab3d26c9c3d4c9b5b59 Mon Sep 17 00:00:00 2001
From: Nicholas Piper <nicholas@users.sourceforge.net>
Date: Mon, 26 Mar 2007 14:10:33 +0000
Subject: 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
---
 ChangeLog                      | 8 ++++++++
 bindings/python/Makefile.am    | 4 ++--
 bindings/python/tests/tests.py | 3 ++-
 configure.ac                   | 1 +
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94e3f92..6ef1fb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
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
-- 
cgit