diff options
| author | Wayne Davison <wayned@samba.org> | 2004-04-30 17:24:49 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2004-04-30 17:24:49 +0000 |
| commit | 6e06d2f31a25c615503f4ab5903fe02d60988634 (patch) | |
| tree | 8e0d35f2d30420f6e2f9f8c071746093ea99f2c8 /testsuite/merge.test | |
| parent | 6a6d21136ac7c1f5700ad439ca9ec2c21c5f9b18 (diff) | |
| download | rsync-6e06d2f31a25c615503f4ab5903fe02d60988634.tar.gz | |
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.
Diffstat (limited to 'testsuite/merge.test')
| -rw-r--r-- | testsuite/merge.test | 4 |
1 files 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 |