- switched on multiplexing for all connections, not just daemon

[rsync/rsync.git] / test.sh

diff --git a/test.sh b/test.sh
index 1717f4a..1e9e24e 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -67,8 +67,11 @@ checkit() {
   failed=
   echo "Running: \"$1\""  >${log}
   echo "">>${log}
-  eval "$1 || failed=YES"  >>${log} 2>&1
-
+  eval "$1"  >>${log} 2>&1
+  status=$?
+  if [ $status != 0 ]; then
+    failed="YES";
+  fi
   echo "-------------">>${log}
   echo "check how the files compare with diff:">>${log}
   echo "">>${log}
@@ -88,7 +91,7 @@ checkit() {
       cat ${log}
       rm ${log}
     else
-      echo "   FAILED (test # ${testnum}).\a"
+      echo "   FAILED (test # ${testnum} status=$status).\a"
     fi
     return 1
   fi
@@ -157,7 +160,7 @@ fi
 rm -rf ${TO}
 mkdir -p ${FROM}2/dir/subdir
 cp -a ${FROM}/dir/subdir/subsubdir ${FROM}2/dir/subdir
-cp ${FROM}/dir/* ${FROM}2/dir 2>/dev/null
+cp -a ${FROM}/dir/* ${FROM}2/dir 2>/dev/null
 runtest "excludes" 'checkit "rsync -vv -Hlrt --delete --include /dir/ --include /dir/\* --include /dir/\*/subsubdir  --include /dir/\*/subsubdir/\*\* --exclude \*\* ${FROM}/dir ${TO}" ${FROM}2/ ${TO}'
 rm -r ${FROM}2