X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/99cdaff70da08dffb209ba58cd5cae4b1a4fb736..4c80c473ed131310ac30478c15f0030f7ce5346d:/testsuite/rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 8dd91a1b..64c6f48e 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -21,13 +21,19 @@
 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() {
@@ -39,6 +45,10 @@ printmsg() {
 # 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
 
@@ -56,18 +66,18 @@ hands_setup() {
     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
+    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
-    umask 077
+    umask 022
 
-    cat $srcdir/*.c | head -2000 > ${FROM}/${F1}
+    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
@@ -130,11 +140,9 @@ checkit() {
     ( cd $3 ; ls -laR ) > ${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