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.

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 73b2b82d37c97578ae6a7d6c21bcab9cfa18dbe3..43b89bc15d189072149738824015490bb95e9831 100644 (file)
--- 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