$RSYNC must be set to absolute path so that it can be passed to --rsync-path

[rsync/rsync.git] / testsuite / hands.test

diff --git a/testsuite/hands.test b/testsuite/hands.test
index dcd80c5..55edab1 100644 (file)
--- a/testsuite/hands.test
+++ b/testsuite/hands.test
@@ -11,40 +11,9 @@
 
 RSYNC="$rsync_bin"
 
-  runtest() {
-    echo -n "Test $1: "
-    eval "$2"
-  }
-  printmsg() {
-    echo ""
-    echo "**** ${1}^G ****"
-    echo ""  
-  }
-
-TMP=/tmp/rsync-test.$$
-FROM=${TMP}/from
-TO=${TMP}/to
-F1=text1
-LOG=${TMP}/log
-
-mkdir $TMP
-mkdir $FROM
-mkdir $TO
-
-# set up test data
-touch ${FROM}/empty
-mkdir ${FROM}/emptydir
-ps ax > ${FROM}/pslist
-echo -n "This file has no trailing lf" > ${FROM}/nolf
-ln -s nolf ${FROM}/nolf-symlink
-cat /etc/inittab /etc/services /etc/resolv.conf > ${FROM}/${F1}
-mkdir ${FROM}/dir
-cp ${FROM}/${F1} ${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
+. "$suitedir/rsync.fns"
+
+hands_setup
 
 checkit() {
   testnum=`expr 0${testnum} + 1`
@@ -68,7 +37,7 @@ checkit() {
   ( cd $3 ; ls -laR ) > ${TMP}/ls-to  2>>${log}
   diff -u ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES
   if [ -z "${failed}" ] ; then
-    echo "     done."
+    echo "${ECHO_T}    done."
     rm $log
     return 0
   else
@@ -76,7 +45,7 @@ checkit() {
       cat ${log}
       rm ${log}
     else
-      echo "   FAILED (test # ${testnum} status=$status).\a"
+      echo "${ECHO_T}  FAILED (test # ${testnum} status=$status).\a"
     fi
     return 1
   fi
@@ -126,20 +95,6 @@ date > ${LONGDIR}/1
 ls -la / > ${LONGDIR}/2
 runtest "long paths" 'checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
 
-if type ssh >/dev/null 2>&1; then
-  if [ "`ssh -o'BatchMode yes' localhost echo yes 2>/dev/null`" = "yes" ]; then
-  rm -rf ${TO}
-    runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
-
-    mv ${TO}/${F1} ${TO}/ThisShouldGo
-    runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'
-  else
-  printmsg "Skipping SSH tests because ssh conection to localhost not authorised"
-  fi
-else
-  printmsg "Skipping SSH tests because ssh is not in the path"
-fi
-
 rm -rf ${TO}
 mkdir -p ${FROM}2/dir/subdir
 cp -a ${FROM}/dir/subdir/subsubdir ${FROM}2/dir/subdir