From 97b077be640071363918a0a27b0acfddd114ff1a Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 15 Dec 2019 03:43:28 +0100
Subject: Apply patches from master.

In an attempt to fix FTBFS (`make -j4 test` failure) on the buildds.
---
 ...on-t-redirect-stderr-by-process-substitut.patch | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch

(limited to 'debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch')

diff --git a/debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch b/debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch
new file mode 100644
index 0000000..1a300f2
--- /dev/null
+++ b/debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch
@@ -0,0 +1,34 @@
+From 49d7a90c159b12173ce202fb9b101465b87da96c Mon Sep 17 00:00:00 2001
+From: Guilhem Moulin <guilhem@fripost.org>
+Date: Sun, 15 Dec 2019 03:38:59 +0100
+Subject: [PATCH 2/2] tests/run: Don't redirect stderr by process substitution.
+
+This seems to cause timing issues.
+---
+ tests/run | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/tests/run b/tests/run
+index a34e4a9..4aa0685 100755
+--- a/tests/run
++++ b/tests/run
+@@ -202,11 +202,13 @@ prepare
+ interimap() { _interimap_cmd "interimap" "$@"; }
+ pullimap()  { _interimap_cmd "pullimap"  "$@"; }
+ _interimap_cmd() {
+-    declare -a ENVIRON=() r=0
+-    local script="$1"
++    declare -a ENVIRON=()
++    local script="$1" rv=0
+     shift
+     environ_set "local"
+-    env -i "${ENVIRON[@]}" perl -I./lib -T "./$script" "$@" 2> >(tee "$STDERR" >&2)
++    env -i "${ENVIRON[@]}" perl -I./lib -T "./$script" "$@" 2>"$STDERR" || rv=$?
++    cat <"$STDERR" >&2
++    return $rv
+ }
+ interimap_init() {
+     local u="${1-remote}"
+-- 
+2.24.0
+
-- 
cgit v1.2.3