[libvigraimpex] 01/01: deb/rules: change test_blockwise{labeling, watersheds} to build with -O0

[Daniel Stender]

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

stender pushed a commit to branch master
in repository libvigraimpex.

commit 36aec075162f9eb7a31513ddf8db42db6f052ea8
Author: Daniel Stender <stender at debian.org>
Date:   Wed Aug 9 20:56:50 2017 +0200

    deb/rules: change test_blockwise{labeling,watersheds} to build with -O0
---
 debian/changelog                                       |  6 +++++-
 debian/patches/series                                  |  1 -
 ...temporarily-disable-blockwisealgorithms-tests.patch | 18 ------------------
 debian/rules                                           |  2 ++
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 43a46b9..af3b698 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ libvigraimpex (1.10.0+git20160211.167be93+dfsg-4) UNRELEASED; urgency=medium
 
   * const-swap.patch: provide DEP-3 header.
   * deb/control: update Homepage.
+  * deb/rules: change test_blockwiselabeling and test_blockwisewatersheds
+    to build with -O0 (Closes: #853513).
+  * drop temporarily-disable-blockwisealgorithms-tests.patch (not needed
+    anymore).
 
- -- Daniel Stender <stender at debian.org>  Wed, 09 Aug 2017 09:53:03 +0200
+ -- Daniel Stender <stender at debian.org>  Thu, 10 Aug 2017 00:07:09 +0200
 
 libvigraimpex (1.10.0+git20160211.167be93+dfsg-3) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 93aa587..0a37ad5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ docsrc-paths.diff
 vigra-config-docdir.diff
 removed-static-docs.diff
 const-swap.patch
-temporarily-disable-blockwisealgorithms-tests.patch
diff --git a/debian/patches/temporarily-disable-blockwisealgorithms-tests.patch b/debian/patches/temporarily-disable-blockwisealgorithms-tests.patch
deleted file mode 100644
index 9ecc4d1..0000000
--- a/debian/patches/temporarily-disable-blockwisealgorithms-tests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: temporarily disable blockwisealgorithms tests for
- blockwise watershed test doesn't succeed with gcc 7 yet.
-Author: Daniel Stender <stender at debian.org>
-Bug: https://github.com/ukoethe/vigra/issues/409 
-Bug-Debian: https://bugs.debian.org/853513
-Forwarded: not-needed
-
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -3,7 +3,7 @@
- INCLUDE(VigraAddTest)
- 
- ADD_SUBDIRECTORY(adjacency_list_graph)
--ADD_SUBDIRECTORY(blockwisealgorithms)
-+#ADD_SUBDIRECTORY(blockwisealgorithms)
- ADD_SUBDIRECTORY(classifier)
- ADD_SUBDIRECTORY(colorspaces)
- #ADD_SUBDIRECTORY(convolution)
diff --git a/debian/rules b/debian/rules
index 8a74b54..d216665 100755
--- a/debian/rules
+++ b/debian/rules
@@ -95,6 +95,8 @@ obj.python%/build-stamp: obj.python%/CMakeCache.txt obj/build-stamp
 obj/test-stamp: obj/build-stamp
 	sed -i 's/exit\ 1/exit\ 0/' obj/test/multiarray/run_test_multiarray_chunked.sh #812852
 	sed -i 's/-O2/-O0/' obj/test/math/CMakeFiles/test_math.dir/flags.make #817840
+	sed -i 's/-O2/-O1/' obj/test/blockwisealgorithms/CMakeFiles/test_blockwiselabeling.dir/flags.make # https://github.com/ukoethe/vigra/issues/409
+	sed -i 's/-O2/-O1/' obj/test/blockwisealgorithms/CMakeFiles/test_blockwisewatersheds.dir/flags.make # https://github.com/ukoethe/vigra/issues/409, #853513
 	$(MAKE) check -C $(dir $(@))
 	touch $(@)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git