[Git][haskell-team/DHG_packages][master] haskell-skylighting-core: grab ubuntu patch to fix build failure on qemu emulated architectures

[Gianfranco Costamagna]

Gianfranco Costamagna pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
471f9e9e by Gianfranco Costamagna at 2020-06-01T19:45:43+02:00
haskell-skylighting-core: grab ubuntu patch to fix build failure on qemu emulated architectures

- - - - -


3 changed files:

- p/haskell-skylighting-core/debian/changelog
- + p/haskell-skylighting-core/debian/patches/98.patch
- + p/haskell-skylighting-core/debian/patches/series


Changes:

=====================================
p/haskell-skylighting-core/debian/changelog
=====================================
@@ -1,3 +1,11 @@
+haskell-skylighting-core (0.8.4-2) unstable; urgency=medium
+
+  * debian/patches/98.patch:
+    - upstream-proposed patch (from Ubuntu) to increase test timeout to avoid
+      failures on qemu-emulated environments such as Ubuntu and riscv64
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Mon, 01 Jun 2020 19:41:38 +0200
+
 haskell-skylighting-core (0.8.4-1) unstable; urgency=medium
 
   * New upstream version.


=====================================
p/haskell-skylighting-core/debian/patches/98.patch
=====================================
@@ -0,0 +1,32 @@
+From 43797b47b93b3c0a64a2238439c83653e8cc7b9c Mon Sep 17 00:00:00 2001
+From: William Grant <wgrant at ubuntu.com>
+Date: Mon, 1 Jun 2020 12:04:40 +0200
+Subject: [PATCH] Increase test timeout to avoid failures with qemu-emulated
+ environments, such as qemu and riscv64 in Ubuntu builders
+
+---
+ skylighting-core/test/test-skylighting.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/skylighting-core/test/test-skylighting.hs b/skylighting-core/test/test-skylighting.hs
+index 682ae4d..f39ba65 100644
+--- a/test/test-skylighting.hs
++++ b/test/test-skylighting.hs
+@@ -193,7 +193,7 @@ p_no_drop cfg syntax t =
+ 
+ noDropTest :: TokenizerConfig -> [Text] -> Syntax -> TestTree
+ noDropTest cfg inps syntax =
+-  localOption (mkTimeout 9000000)
++  localOption (mkTimeout 15000000)
+   $ testCase (Text.unpack (sName syntax))
+   $ mapM_ go inps
+     where go inp =
+@@ -210,7 +210,7 @@ noDropTest cfg inps syntax =
+                 assertFailure (show e ++ "\ninput = " ++ show inp))
+ 
+ tokenizerTest :: TokenizerConfig -> SyntaxMap -> Bool -> FilePath -> TestTree
+-tokenizerTest cfg sMap regen inpFile = localOption (mkTimeout 9000000) $
++tokenizerTest cfg sMap regen inpFile = localOption (mkTimeout 15000000) $
+   goldenTest testname getExpected getActual
+       (compareValues referenceFile) updateGolden
+   where testname = lang ++ " tokenizing of " ++ inpFile


=====================================
p/haskell-skylighting-core/debian/patches/series
=====================================
@@ -0,0 +1 @@
+98.patch



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/471f9e9e291c3b2b818537e84ba5f7f65719cd01

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/471f9e9e291c3b2b818537e84ba5f7f65719cd01
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20200601/264d67ef/attachment-0001.html>