X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7d6916547f572e1d7e246b73d403265ff9b59714..1336e4146079b92460fcfd67cbec5ed8ad7bdafa:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 568f9d5c..b34faa4c 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
 
-    which head
-    ls -lR ${srcdir} | head -10
+#      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 () {
+    echo "        makepath $1"
     p="$1"
     (
 	# Absolut Unix.
@@ -106,7 +112,7 @@ makepath () {
 	# This will break if $1 contains a space.
 	for c in `echo $p | tr '/' ' '`
 	do 
-	    [ -d "$c" ] || mkdir "$c" || return $? 
+	    [ -d "$c" ] || mkdir "$c" || { echo "failed to create $c" >&2; return $? }
 	    cd "$c" || return $?
 	done
     )
@@ -139,8 +145,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}
+    ( cd "$2" && rsync_ls_lR ) > ${TMP}/ls-from 2>>${log}
+    ( cd "$3" && rsync_ls_lR ) > ${TMP}/ls-to  2>>${log}
     diff -c ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
     if [ -z "${failed}" ] ; then
 	rm $log