diff options
| -rw-r--r-- | doc/getting-started.md | 2 | ||||
| -rw-r--r-- | doc/template.html | 2 | ||||
| -rw-r--r-- | tests/condstore/t | 2 | ||||
| -rw-r--r-- | tests/pullimap/t | 2 | ||||
| -rwxr-xr-x | tests/run | 8 | ||||
| -rw-r--r-- | tests/sync-live-multi/t | 2 | ||||
| -rw-r--r-- | tests/sync-live/t | 2 |
7 files changed, 11 insertions, 9 deletions
diff --git a/doc/getting-started.md b/doc/getting-started.md index da8f116..c497ec6 100644 --- a/doc/getting-started.md +++ b/doc/getting-started.md @@ -24,7 +24,7 @@ While most bidirectional synchronisation software (such as [OfflineIMAP]) are able to handle a mail storage in Maildir format, *InterIMAP is not*. Instead, InterIMAP needs an [IMAP4rev1] server on *both* peers to synchronize. This may sound like a severe limitation at first, but by -seeing both local and remote mail storage though the same “IMAP lens”, +seeing both local and remote mail storage through the same “IMAP lens”, InterIMAP is able to take advantage of the abstraction layer and perform significant optimizations, yielding [much faster](benchmark.html) synchronization. diff --git a/doc/template.html b/doc/template.html index 41bf3d7..0d497db 100644 --- a/doc/template.html +++ b/doc/template.html @@ -64,7 +64,7 @@ $endfor$ $if(title)$ <div class="page-header"> $if(parent)$ - <div class=parent><a href="$parent$"><span class="glyphicon glyphicon-circle-arrow-up" aria-hidden="true"></span> Parent</a></div> + <div class=parent><a href="$parent$"><span class="fa fa-arrow-circle-up" aria-hidden="true"></span> Parent</a></div> $endif$ <h1 style="">$title$</h1> </div> 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 @@ -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}" 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 |