test-rm: fix regexes to handle newer *and* older git

To accommodate optional lines, we need to use a construct like this:

  foo(
  bar)?

instead of this:

  foo
  (bar)?

The problem became apparent when people tested against older git after
the introduction of the patch to work with newer git:
292361d86d1cf0cc555681ae43371d66c8ebb366

Thanks to Greg Troxel and Basil Mohamed Gohar for reporting the
problem.

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

diff --git a/t/test-rm.sh b/t/test-rm.sh
index 3bd498e0ef3022ee95564e085e58f7526fe1422d..ca094f1aff49127833d17d2299ab7fc6a72e37bb 100755 (executable)
--- a/t/test-rm.sh
+++ b/t/test-rm.sh
@@ -51,11 +51,11 @@ WVPASS bup rm --unsafe /src
 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\.\.\.\.\.\.[ ]+\./)?
+\*deleting[ ]+refs/heads/src(
+\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
-(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?'
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?'
 
 
 WVSTART "rm /foo (one of many)"
@@ -73,11 +73,11 @@ WVPASS bup rm --unsafe /src
 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\.\.\.\.\.\.[ ]+\./)?
+\*deleting[ ]+refs/heads/src(
+\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
-(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo /bar (multiple of many)"
@@ -97,11 +97,11 @@ wv_matches_rx "$observed" \
 "\*deleting[ ]+logs/refs/heads/src-2
 \*deleting[ ]+logs/refs/heads/src-4
 \*deleting[ ]+refs/heads/src-2
-\*deleting[ ]+refs/heads/src-4
-(\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
+\*deleting[ ]+refs/heads/src-4(
+\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
-(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo /bar (all)"
@@ -121,11 +121,11 @@ wv_matches_rx "$observed" \
 \*deleting[ ]+refs/heads/src-2
 \*deleting[ ]+refs/heads/src-3
 \*deleting[ ]+refs/heads/src-4
-\*deleting[ ]+refs/heads/src-5
-(\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
+\*deleting[ ]+refs/heads/src-5(
+\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
-(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 WVSTART "rm /foo/bar (lone save - equivalent to rm /foo)"
@@ -144,11 +144,11 @@ WVPASS bup rm --unsafe /src/"$save1"
 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\.\.\.\.\.\.[ ]+\./)?
+\*deleting[ ]+refs/heads/src(
+\.d\.\.t\.\.\.\.\.\.[ ]+\./)?
 \.d\.\.t\.\.\.[.]*[ ]+logs/refs/heads/
-\.d\.\.t\.\.\.[.]*[ ]+refs/heads/
-(>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
+\.d\.\.t\.\.\.[.]*[ ]+refs/heads/(
+>f\+\+\+\+\+\+\+\+\+[ ]+packed-refs)?"
 
 
 verify-changes-caused-by-rewriting-save()