X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e052b21f32e69c0368ec1379b4cd22ebe662e557..04d8e8b25f14316e8a87f387870e8f1a89b802cc:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 811c9bad..48851ba3 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -4,16 +4,36 @@
 
 # General-purpose test functions for rsync.
 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version
+# 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+
 TMP="$scratchdir"
 FROM=${TMP}/from
 TO=${TMP}/to
-F1=text1
 LOG=${TMP}/log
 RSYNC="$rsync_bin"
 
 runtest() {
     echo $ECHO_N "Test $1: $ECHO_C"
-    eval "$2"
+    if eval "$2"
+    then
+	echo "${ECHO_T}	done."
+	return 0
+    else
+	echo "${ECHO_T} failed!"
+	return 1
+    fi
 }
 
 printmsg() {
@@ -21,10 +41,19 @@ printmsg() {
 }
 
 
+rsync_ls_lR() {
+    find "$@" -print | sort | xargs $TLS
+}
+
+
 ####################
 # Build test directories TO and FROM, with FROM full of files.
 
 hands_setup() {
+    # Clean before creation
+    rm -rf $FROM
+    rm -rf $TO
+    
     [ -d $FROM ] || mkdir $FROM
     [ -d $TO ] || mkdir $TO
 
@@ -38,28 +67,54 @@ hands_setup() {
     # This causes a little problem that "ls -l" of the two will not be
     # the same.  So, we need to set our umask before doing any creations.
 
-    umask 0
-
     # set up test data
     touch ${FROM}/empty
     mkdir ${FROM}/emptydir
 
-    # a few hundred lines of test
-    ls -lR / | head -200 > ${FROM}/filelist
+    # a hundred lines of text or so
+    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
+    umask 0
     ln -s nolf ${FROM}/nolf-symlink
-    cat $srcdir/*.c | head -2000 > ${FROM}/${F1}
+    umask 022
+
+    cat $srcdir/*.c > ${FROM}/text
     mkdir ${FROM}/dir
-    cp ${FROM}/${F1} ${FROM}/dir
+    cp ${FROM}/text ${FROM}/dir
     mkdir ${FROM}/dir/subdir
     mkdir ${FROM}/dir/subdir/subsubdir
     ls -ltr /etc > ${FROM}/dir/subdir/subsubdir/etc-ltr-list
     mkdir ${FROM}/dir/subdir/subsubdir2
     ls -lt /bin > ${FROM}/dir/subdir/subsubdir2/bin-lt-list
 
-    umask 077
+#      echo testing head:
+#      ls -lR ${srcdir} | head -10 || echo failed
+}
+
+
+
+
+####################
+# Many machines do not have "mkdir -p", so we have to build up long paths.
+# How boring.  
+makepath () {
+    p="$1"
+    (
+	# Absolut Unix.
+	if echo $p | grep '^/' >/dev/null
+	then
+	    cd /
+	fi
+    
+	# This will break if $1 contains a space.
+	for c in `echo $p | tr '/' ' '`
+	do 
+	    [ -d "$c" ] || mkdir "$c" || return $? 
+	    cd "$c" || return $?
+	done
+    )
 }
 
 
@@ -89,15 +144,13 @@ 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
-	echo "${ECHO_T}	done."
 	rm $log
 	return 0
     else
-	echo "${ECHO_T} failed!"
 	cat ${log}
 	rm ${log}
 	return 1