Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed "diff -c" to "diff -u".
[rsync/rsync.git]
/
testsuite
/
rsync.fns
diff --git
a/testsuite/rsync.fns
b/testsuite/rsync.fns
index
5e76538
..
7cc7ad0
100644
(file)
--- a/
testsuite/rsync.fns
+++ b/
testsuite/rsync.fns
@@
-140,10
+140,6
@@
makepath () {
# should be excluded, you might need to use something else.
checkit() {
# should be excluded, you might need to use something else.
checkit() {
- # sleep here to prevent a copy from being made within the
- # default --modify-window time on Cygwin
- sleep 2
-
failed=
# We can just write everything to stdout/stderr, because the
failed=
# We can just write everything to stdout/stderr, because the
@@
-161,7
+157,7
@@
checkit() {
echo ""
for f in `cd "$2"; find . -type f -print `
do
echo ""
for f in `cd "$2"; find . -type f -print `
do
- diff -
c
"$2"/"$f" "$3"/"$f" || failed=YES
+ diff -
u
"$2"/"$f" "$3"/"$f" || failed=YES
done
echo "-------------"
done
echo "-------------"
@@
-169,7
+165,7
@@
checkit() {
echo ""
( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from
( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to
echo ""
( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from
( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to
- diff -
c
${TMP}/ls-from ${TMP}/ls-to || failed=YES
+ diff -
u
${TMP}/ls-from ${TMP}/ls-to || failed=YES
if [ -z "${failed}" ] ; then
return 0
else
if [ -z "${failed}" ] ; then
return 0
else