[DHG_packages] 01/02: email-validate: Disable doctests on armel

Ilias Tsitsimpis iliastsi-guest at moszumanska.debian.org
Thu Nov 16 11:55:12 UTC 2017


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

iliastsi-guest pushed a commit to branch master
in repository DHG_packages.

commit dd24604a22eca62a849bdef1c3aa976df99d5ba1
Author: Ilias Tsitsimpis <iliastsi at debian.org>
Date:   Thu Nov 16 13:03:27 2017 +0200

    email-validate: Disable doctests on armel
---
 p/haskell-email-validate/debian/changelog          |  5 ++--
 .../debian/patches/disable-doctests                | 30 ++++++++++++++++++++++
 p/haskell-email-validate/debian/patches/series     |  1 +
 p/haskell-email-validate/debian/rules              |  5 ++++
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/p/haskell-email-validate/debian/changelog b/p/haskell-email-validate/debian/changelog
index 83727e1..40d1839 100644
--- a/p/haskell-email-validate/debian/changelog
+++ b/p/haskell-email-validate/debian/changelog
@@ -1,12 +1,13 @@
-haskell-email-validate (2.3.1-2) UNRELEASED; urgency=medium
+haskell-email-validate (2.3.1-2) unstable; urgency=medium
 
   * Change Priority to optional. Since Debian Policy version 4.0.1,
     priority extra has been deprecated.
   * Use the HTTPS form of the copyright-format URL
   * Modify d/watch and Source field in d/copyright to use HTTPS
   * Declare compliance with Debian policy 4.1.1
+  * Disable doctests on armel
 
- -- Ilias Tsitsimpis <iliastsi at debian.org>  Wed, 01 Nov 2017 12:14:07 +0200
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Thu, 16 Nov 2017 13:02:26 +0200
 
 haskell-email-validate (2.3.1-1) unstable; urgency=medium
 
diff --git a/p/haskell-email-validate/debian/patches/disable-doctests b/p/haskell-email-validate/debian/patches/disable-doctests
new file mode 100644
index 0000000..5c4259b
--- /dev/null
+++ b/p/haskell-email-validate/debian/patches/disable-doctests
@@ -0,0 +1,30 @@
+Description: Add test-doctests flag
+ Add flag to enable/disable the doctest suite. This is needed because doctests
+ fail on armel because of #839840.
+Author: Ilias Tsitsimpis <iliastsi at debian.org>
+---
+
+Index: b/email-validate.cabal
+===================================================================
+--- a/email-validate.cabal
++++ b/email-validate.cabal
+@@ -21,6 +21,10 @@ source-repository this
+     location: git://github.com/Porges/email-validate-hs.git
+     tag: v2.3.1
+ 
++flag test-doctests
++    description: Enable/Disable the doctest suite
++    default: True
++
+ library
+     build-depends:
+         base >= 4.4 && < 5,
+@@ -50,6 +54,8 @@ test-suite Main
+ 
+ test-suite doctests
+     type: exitcode-stdio-1.0
++    if !flag(test-doctests)
++        buildable: False
+     ghc-options: -threaded
+     default-language: Haskell2010
+     hs-source-dirs: tests
diff --git a/p/haskell-email-validate/debian/patches/series b/p/haskell-email-validate/debian/patches/series
new file mode 100644
index 0000000..7852347
--- /dev/null
+++ b/p/haskell-email-validate/debian/patches/series
@@ -0,0 +1 @@
+disable-doctests
diff --git a/p/haskell-email-validate/debian/rules b/p/haskell-email-validate/debian/rules
index 01f1aaf..36b92b7 100755
--- a/p/haskell-email-validate/debian/rules
+++ b/p/haskell-email-validate/debian/rules
@@ -2,5 +2,10 @@
 
 DEB_ENABLE_TESTS = yes
 
+# doctests fail on armel due to #839840
+ifeq (armel,$(DEB_HOST_ARCH))
+	DEB_SETUP_GHC_CONFIGURE_ARGS += -f-test-doctests
+endif
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk

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



More information about the Pkg-haskell-commits mailing list