[mipp] 02/02: New patch: fix the test suite for installed package

[Antonio Valentino]

This is an automated email from the git hooks/post-receive script.

a_valentino-guest pushed a commit to branch master
in repository mipp.

commit b4c8e688d877345753c2164903763de24d9ef2bb
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sun Jun 29 16:04:50 2014 +0000

    New patch: fix the test suite for installed package
---
 ...est.patch => 0001-skip-tsx-metadata-test.patch} | 15 ++++++++----
 .../patches/0002-fix-build-path-management.patch   | 27 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++-
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/debian/patches/skip-tsx-metadata-test.patch b/debian/patches/0001-skip-tsx-metadata-test.patch
similarity index 65%
rename from debian/patches/skip-tsx-metadata-test.patch
rename to debian/patches/0001-skip-tsx-metadata-test.patch
index d9a9796..c45ad87 100644
--- a/debian/patches/skip-tsx-metadata-test.patch
+++ b/debian/patches/0001-skip-tsx-metadata-test.patch
@@ -1,12 +1,17 @@
-Skip the test on metadata
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Sun, 29 Jun 2014 15:57:36 +0000
+Subject: skip tsx metadata test
 
 The test failure seems to depend on a change in the way GDAL formats
 metadata string rather then to a real problem.
+---
+ tests/test_xsar.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: mipp/tests/test_xsar.py
-===================================================================
---- mipp.orig/tests/test_xsar.py
-+++ mipp/tests/test_xsar.py
+diff --git a/tests/test_xsar.py b/tests/test_xsar.py
+index b77ff3c..abaec2e 100644
+--- a/tests/test_xsar.py
++++ b/tests/test_xsar.py
 @@ -61,7 +61,7 @@ class Test(unittest.TestCase):
          mdac = xsar.Metadata().read(datadir + '/' + mda.product_name + '.mda')
          cross_sum = img.sum()
diff --git a/debian/patches/0002-fix-build-path-management.patch b/debian/patches/0002-fix-build-path-management.patch
new file mode 100644
index 0000000..10da1aa
--- /dev/null
+++ b/debian/patches/0002-fix-build-path-management.patch
@@ -0,0 +1,27 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sun, 29 Jun 2014 16:01:59 +0000
+Subject: fix build path management
+
+This patch allows to run the test suite when mipp is installed in the
+system default path.
+---
+ tests/buildpath_to_syspath.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/buildpath_to_syspath.py b/tests/buildpath_to_syspath.py
+index ae4f234..756c53e 100644
+--- a/tests/buildpath_to_syspath.py
++++ b/tests/buildpath_to_syspath.py
+@@ -12,8 +12,10 @@ build_platlib = os.path.join(build_base, 'lib.' + plat + '-' + python_version)
+ 
+ build_path = os.path.join(proj_path, build_platlib)
+ if not os.path.isdir(build_path):
+-    assert False, "No such build path '%s'"%build_path
+-sys.path.insert(0, build_path)
++    #assert False, "No such build path '%s'"%build_path
++    pass
++else:
++    sys.path.insert(0, build_path)
+ 
+ if __name__ == '__main__':
+     print build_platlib
diff --git a/debian/patches/series b/debian/patches/series
index ed4019d..9c8f208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-skip-tsx-metadata-test.patch
+0001-skip-tsx-metadata-test.patch
+0002-fix-build-path-management.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mipp.git