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
Call this 2.4.7pre4
[rsync/rsync.git]
/
testsuite
/
rsync.fns
diff --git
a/testsuite/rsync.fns
b/testsuite/rsync.fns
index
c501718
..
8f8e7d3
100644
(file)
--- a/
testsuite/rsync.fns
+++ b/
testsuite/rsync.fns
@@
-41,6
+41,11
@@
printmsg() {
}
}
+rsync_ls_lR() {
+ find "$@" -print | sort | xargs $TLS
+}
+
+
####################
# Build test directories TO and FROM, with FROM full of files.
####################
# Build test directories TO and FROM, with FROM full of files.
@@
-67,7
+72,7
@@
hands_setup() {
mkdir ${FROM}/emptydir
# a hundred lines of text or so
mkdir ${FROM}/emptydir
# a hundred lines of text or so
-
ls -
lR ${srcdir} > ${FROM}/filelist
+
rsync_ls_
lR ${srcdir} > ${FROM}/filelist
# This might fail on systems that don't have -n
echo $ECHO_N "This file has no trailing lf$ECHO_C" > ${FROM}/nolf
# This might fail on systems that don't have -n
echo $ECHO_N "This file has no trailing lf$ECHO_C" > ${FROM}/nolf
@@
-84,8
+89,8
@@
hands_setup() {
mkdir ${FROM}/dir/subdir/subsubdir2
ls -lt /bin > ${FROM}/dir/subdir/subsubdir2/bin-lt-list
mkdir ${FROM}/dir/subdir/subsubdir2
ls -lt /bin > ${FROM}/dir/subdir/subsubdir2/bin-lt-list
- echo testing head:
- ls -lR ${srcdir} | head -10 || echo failed
+
#
echo testing head:
+
#
ls -lR ${srcdir} | head -10 || echo failed
}
}
@@
-95,6
+100,7
@@
hands_setup() {
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
makepath () {
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
makepath () {
+ echo " makepath $1"
p="$1"
(
# Absolut Unix.
p="$1"
(
# Absolut Unix.
@@
-106,8
+112,12
@@
makepath () {
# This will break if $1 contains a space.
for c in `echo $p | tr '/' ' '`
do
# This will break if $1 contains a space.
for c in `echo $p | tr '/' ' '`
do
- [ -d "$c" ] || mkdir "$c" || return $?
- cd "$c" || return $?
+ if [ -d "$c" ] || mkdir "$c"
+ then
+ cd "$c" || return $?
+ else
+ echo "failed to create $c" >&2; return $?
+ fi
done
)
}
done
)
}
@@
-139,8
+149,8
@@
checkit() {
echo "-------------">>${log}
echo "check how the directory listings compare with diff:">>${log}
echo "">>${log}
echo "-------------">>${log}
echo "check how the directory listings compare with diff:">>${log}
echo "">>${log}
- ( cd
$2 ; ls -la
R ) > ${TMP}/ls-from 2>>${log}
- ( cd
$3 ; ls -la
R ) > ${TMP}/ls-to 2>>${log}
+ ( cd
"$2" && rsync_ls_l
R ) > ${TMP}/ls-from 2>>${log}
+ ( cd
"$3" && rsync_ls_l
R ) > ${TMP}/ls-to 2>>${log}
diff -c ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
if [ -z "${failed}" ] ; then
rm $log
diff -c ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
if [ -z "${failed}" ] ; then
rm $log