[cpl] 01/02: Workround FTBS on armhf: disable cpl_ffftw-test

[Ole Streicher]

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

olebole-guest pushed a commit to branch debian
in repository cpl.

commit c91a1f7c6c537be26565e052537a570ed22c7ced
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 16 09:36:44 2014 +0200

    Workround FTBS on armhf: disable cpl_ffftw-test
---
 debian/changelog                        |  6 ++++++
 debian/patches/disable_some_tests.patch | 21 +++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2fc4286..93a5bda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl (6.4.2-3) unstable; urgency=low
+
+  * Workround FTBS on armhf: disable cpl_ffftw-test
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 16 Jun 2014 09:36:51 +0200
+
 cpl (6.4.2-2) unstable; urgency=low
 
   * Include symbols files
diff --git a/debian/patches/disable_some_tests.patch b/debian/patches/disable_some_tests.patch
index ba30930..8eac600 100644
--- a/debian/patches/disable_some_tests.patch
+++ b/debian/patches/disable_some_tests.patch
@@ -26,11 +26,12 @@ Description: Disable some tests to workaround FTBS on armel and s390x.
          cpl_plot-test \
          cpl_polynomial-test \
          cpl_error-test \
-@@ -140,6 +138,9 @@
+@@ -140,6 +138,10 @@
          cpl_property-test \
          cpl_propertylist-test
  
-+XFAIL_TESTS = cpl_image_basic-test \
++SKIP_TESTS = \
++        cpl_image_basic-test \
 +	cpl_mask-test
 +
  # We need to remove any files that the above tests created.
@@ -38,7 +39,7 @@ Description: Disable some tests to workaround FTBS on armel and s390x.
  	$(RM) *.fits *.tfits *.log
 --- a/cpldrs/tests/Makefile.am
 +++ b/cpldrs/tests/Makefile.am
-@@ -63,8 +63,7 @@
+@@ -63,17 +63,18 @@
  	OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)"
  
  
@@ -48,13 +49,17 @@ Description: Disable some tests to workaround FTBS on armel and s390x.
          cpl_geom_img-test \
          cpl_detector-test \
          cpl_photom-test \
-@@ -73,7 +72,8 @@
-         cpl_ppm-test \
-         cpl_fft-test
+         cpl_wcs-test \
+         cpl_wlcalib-test \
+-        cpl_ppm-test \
+-        cpl_fft-test
++        cpl_ppm-test
  
 -XFAIL_TESTS =
-+XFAIL_TESTS = cpl_fit-test \
-+        cpl_apertures-test
++SKIP_TESTS = \
++        cpl_fit-test \
++        cpl_apertures-test \
++        cpl_fft-test
  
  # We need to remove any files that the above tests created.
  clean-local:

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