From b1965740b632e6b905991425692807f98a5eb748 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Wed, 29 Jan 2020 12:25:28 +0100 Subject: d/patches: Remove patches applied upstream. --- ...on-t-redirect-stderr-by-process-substitut.patch | 34 ---------------------- 1 file changed, 34 deletions(-) delete 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 deleted file mode 100644 index 1a300f2..0000000 --- a/debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 49d7a90c159b12173ce202fb9b101465b87da96c Mon Sep 17 00:00:00 2001 -From: Guilhem Moulin -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