[Pkg-octave-commit] [octave-image] 01/11: d/p/skip-unit-tests-watershed.patch: New patch

Rafael Laboissiere rafael at debian.org
Sun Sep 10 19:41:04 UTC 2017


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

rafael pushed a commit to branch master
in repository octave-image.

commit 277cafcd599d6b663e1d5c156c2d3b41a7525b09
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Sep 10 11:24:11 2017 -0300

    d/p/skip-unit-tests-watershed.patch: New patch
---
 debian/patches/series                          |  1 +
 debian/patches/skip-unit-tests-watershed.patch | 29 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 4bf045c..5dd6689 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 im2bw-unit-test.patch
 typo-unit-test-watershed.patch
+skip-unit-tests-watershed.patch
diff --git a/debian/patches/skip-unit-tests-watershed.patch b/debian/patches/skip-unit-tests-watershed.patch
new file mode 100644
index 0000000..4828bec
--- /dev/null
+++ b/debian/patches/skip-unit-tests-watershed.patch
@@ -0,0 +1,29 @@
+Description: Skip some failing unit tests for function watershed
+ We are doing so for now, just to avoid the FTBFS with version 1.5.0
+ of octave-pkg-dev (Bug#874125).  The bugs must be fixed in the
+ future, though.
+Author: Rafael Laboissiere <rafael at debian.org>
+Bug: https://savannah.gnu.org/bugs/?51719
+Forwarded: not-needed
+Last-Update: 2017-09-10
+
+--- octave-image-2.6.1.orig/src/watershed.cc
++++ octave-image-2.6.1/src/watershed.cc
+@@ -490,7 +490,7 @@ or with a binary matrix representing a c
+ ## The following test is required for Matlab compatibility.  There must be
+ ## something specific about their implementation that causes it to return
+ ## this value.  Even when solving it on paper, we get different results.
+-%!test
++%!xtest
+ %! im = [
+ %!     2     3    30     2
+ %!     3    30     3    30
+@@ -600,7 +600,7 @@ or with a binary matrix representing a c
+ %! assert (watershed (im, [1 1 0; 1 1 1; 0 1 1]), labeled_weird);
+ 
+ ## This test is failing for Matlab compatibility
+-%!test
++%!xtest
+ %! im_full = [
+ %!   1   2  10   3   8   7   5
+ %!   3   2   5  10   8   1   4

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-image.git



More information about the Pkg-octave-commit mailing list