From 6e06d2f31a25c615503f4ab5903fe02d60988634 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 30 Apr 2004 17:24:49 +0000 Subject: [PATCH] Don't rely on the local shell's wildcard expansion to make the test work right -- it might not be quite as compatible as we need. --- testsuite/merge.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/merge.test b/testsuite/merge.test index 73b2b82d..43b89bc1 100644 --- a/testsuite/merge.test +++ b/testsuite/merge.test @@ -43,9 +43,9 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/ cp -p "$from3dir"/sub2/subby "$chkdir"/sub2 # Get rid of any directory-time differences -touch "$fromdir"? "$chkdir" "$fromdir"?/sub? "$chkdir"/sub? +$RSYNC -av --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/" -checkit "$RSYNC -aHvv \"$fromdir\"?/ \"$todir/\"" "$chkdir" "$todir" +checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 -- 2.34.1