diff options
| author | Wayne Davison <wayned@samba.org> | 2007-04-29 15:01:57 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2007-04-29 15:01:57 +0000 |
| commit | bf10faa9dcf6c11bcc85a32e1cda070c4acf21de (patch) | |
| tree | 258744de46f2fed3a91a915a81ce89d8b5dceb6b /testsuite | |
| parent | 548ca46fecd58a43fd9f19e79bdc968f21c71992 (diff) | |
| download | rsync-bf10faa9dcf6c11bcc85a32e1cda070c4acf21de.tar.gz rsync-bf10faa9dcf6c11bcc85a32e1cda070c4acf21de.tar.bz2 rsync-bf10faa9dcf6c11bcc85a32e1cda070c4acf21de.zip | |
Added a "sleep 1" to make certain failures more reproducible.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/merge.test | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/testsuite/merge.test b/testsuite/merge.test index cd10a2aa..cc979bc4 100644 --- a/testsuite/merge.test +++ b/testsuite/merge.test @@ -42,6 +42,9 @@ cp -p from1/dir-and-not-dir/inside chk/dir-and-not-dir cp -p from2/sub1/uno from3/sub1/dos from2/sub1/tres chk/sub1 cp -p from3/sub2/subby chk/sub2 +# Make sure that time has moved on. +sleep 1 + # Get rid of any directory-time differences $RSYNC -av --existing -f 'exclude,! */' from1/ from2/ $RSYNC -av --existing -f 'exclude,! */' from2/ from3/ |