test-rm: extend rsync pattern flexibility to all lines

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/t/test-rm.sh b/t/test-rm.sh
index ca094f1aff49127833d17d2299ab7fc6a72e37bb..00a5a8579ebef4fc639fdaecd69de71381e8c93f 100755 (executable)
--- a/t/test-rm.sh
+++ b/t/test-rm.sh
@@ -52,7 +52,7 @@ observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 '\*deleting[ ]+logs/refs/heads/src
 \*deleting[ ]+refs/heads/src(
-\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
 \.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
 >f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?'
@@ -74,7 +74,7 @@ observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 "\*deleting[ ]+logs/refs/heads/src
 \*deleting[ ]+refs/heads/src(
-\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
 \.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
 >f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
@@ -98,7 +98,7 @@ wv_matches_rx "$observed" \
 \*deleting[ ]+logs/refs/heads/src-4
 \*deleting[ ]+refs/heads/src-2
 \*deleting[ ]+refs/heads/src-4(
-\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
 \.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
 >f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
@@ -122,7 +122,7 @@ wv_matches_rx "$observed" \
 \*deleting[ ]+refs/heads/src-3
 \*deleting[ ]+refs/heads/src-4
 \*deleting[ ]+refs/heads/src-5(
-\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
 \.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
 >f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
@@ -145,7 +145,7 @@ observed="$(compare-trees bup/ bup-baseline/ | LC_ALL=C sort)" || exit $?
 wv_matches_rx "$observed" \
 "\*deleting[ ]+logs/refs/heads/src
 \*deleting[ ]+refs/heads/src(
-\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
+\.d\.\.t\.\.\.[.]*[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
 \.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
 >f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"