BSD machines don't seem to have head(1).

[rsync/rsync.git] / testsuite / rsync.fns

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 369d38c..a583c15 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -27,7 +27,14 @@ 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 +46,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,8 +67,8 @@ 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
@@ -65,7 +76,7 @@ hands_setup() {
     ln -s nolf ${FROM}/nolf-symlink
     umask 077
 
-    cat $srcdir/*.c | head -2000 > ${FROM}/${F1}
+    cat $srcdir/*.c > ${FROM}/${F1}
     mkdir ${FROM}/dir
     cp ${FROM}/${F1} ${FROM}/dir
     mkdir ${FROM}/dir/subdir
@@ -77,6 +88,30 @@ hands_setup() {
 
 
 
+
+####################
+# 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
+    )
+}
+
+
+
 ###########################
 # Run a test (in '$1') then compare directories $2 and $3 to see if
 # there are any difference.  If there are, explain them.
@@ -106,11 +141,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