X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/952cf8f4f34feba3d40f2cda90d2453f70aa2b3a..6773a7798f41aece4794044dd851f26d29362b4d:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index c5017187..fdc22264 100644 --- 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. @@ -67,7 +72,7 @@ hands_setup() { 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 @@ -84,8 +89,8 @@ hands_setup() { 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 } @@ -139,8 +144,8 @@ checkit() { echo "-------------">>${log} echo "check how the directory listings compare with diff:">>${log} echo "">>${log} - ( cd $2 ; ls -laR ) > ${TMP}/ls-from 2>>${log} - ( cd $3 ; ls -laR ) > ${TMP}/ls-to 2>>${log} + ( rsync_ls_lR "$2" ) > ${TMP}/ls-from 2>>${log} + ( rsync_ls_lR "$3" ) > ${TMP}/ls-to 2>>${log} diff -c ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES if [ -z "${failed}" ] ; then rm $log