Merge tag 'upstream/0.5' into debian

Upstream version 0.5

1 files 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}"