From 97b077be640071363918a0a27b0acfddd114ff1a Mon Sep 17 00:00:00 2001 From: Guilhem Moulin 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. --- debian/changelog | 6 ++ debian/patches/series | 2 + ...on-t-redirect-stderr-by-process-substitut.patch | 34 +++++++++++ ...rease-timeout-from-2-to-5s-after-backgrou.patch | 68 ++++++++++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 debian/patches/tests-run-Don-t-redirect-stderr-by-process-substitut.patch create mode 100644 debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4d19301..7ff1de4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +interimap (0.5~rc-2) experimental; urgency=low + + * Apply patches from master to make the test suite pass on the buildds. + + -- Guilhem Moulin Sun, 15 Dec 2019 03:44:27 +0100 + interimap (0.5~rc-1) experimental; urgency=low * New upstream release. Closes: #942725, #944812, #944859. diff --git a/debian/patches/series b/debian/patches/series index 649d1d8..e7fcfbe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,4 @@ Ignore-custom-lib-PATH.patch Mention-the-Debian-BTS-in-the-manpages.patch +tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch +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 +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 + diff --git a/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch b/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch new file mode 100644 index 0000000..76b678b --- /dev/null +++ b/debian/patches/tests-t-Increase-timeout-from-2-to-5s-after-backgrou.patch @@ -0,0 +1,68 @@ +From a7517e35cf0c835fcb68db56d8634fab9b4d5f0d Mon Sep 17 00:00:00 2001 +From: Guilhem Moulin +Date: Sun, 15 Dec 2019 03:35:51 +0100 +Subject: [PATCH 1/2] tests/*/t: Increase timeout from 2 to 5s after background + syncs. + +--- + tests/condstore/t | 2 +- + tests/pullimap/t | 2 +- + tests/sync-live-multi/t | 2 +- + tests/sync-live/t | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/condstore/t b/tests/condstore/t +index d4da50f..1963b2b 100644 +--- a/tests/condstore/t ++++ b/tests/condstore/t +@@ -31,7 +31,7 @@ while [ $(date +%s) -le $timer ]; do + doveadm -u "$u" flags "$a" "$f" mailbox "INBOX" "${seqs//$'\n'/,}" + sleep "0.0$(shuf -n1 -i10-99)" # 10 to 99ms + done +-sleep 2 ++sleep 5 + + ptree_abort $PID + trap - EXIT INT TERM +diff --git a/tests/pullimap/t b/tests/pullimap/t +index 79da3e0..115432d 100644 +--- a/tests/pullimap/t ++++ b/tests/pullimap/t +@@ -123,7 +123,7 @@ while [ $(date +%s) -le $timer ]; do + sleep "$s" + done + +-sleep 2 ++sleep 5 + ptree_abort $PID + trap - EXIT INT TERM + +diff --git a/tests/sync-live-multi/t b/tests/sync-live-multi/t +index 9b129ec..ba7f326 100644 +--- a/tests/sync-live-multi/t ++++ b/tests/sync-live-multi/t +@@ -96,7 +96,7 @@ done + # wait a little longer so interimap has time to run loop() again and + # synchronize outstanding changes, then terminate the processes we + # started above +-sleep 2 ++sleep 5 + + ptree_abort ${PID[@]} + trap - EXIT INT TERM +diff --git a/tests/sync-live/t b/tests/sync-live/t +index 19d1e08..5f5b291 100644 +--- a/tests/sync-live/t ++++ b/tests/sync-live/t +@@ -65,7 +65,7 @@ done + # wait a little longer so interimap has time to run loop() again and + # synchronize outstanding changes, then terminate the process we started + # above +-sleep 2 ++sleep 5 + + ptree_abort $PID + trap - EXIT INT TERM +-- +2.24.0 + -- cgit v1.2.3