From: Martin Pool <mbp@samba.org>
Date: Sun, 2 Dec 2001 07:22:54 +0000 (+0000)
Subject: Fix test suite breakage in calling tls.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/3d807132e4a24f61505af76f10c396204935599f

Fix test suite breakage in calling tls.

Clean up test directory on completion.
---

diff --git a/testsuite/hands.test b/testsuite/hands.test
index 01f19bc6..fced34a9 100644
--- a/testsuite/hands.test
+++ b/testsuite/hands.test
@@ -26,3 +26,5 @@ cp ${FROM}/text ${TO}/ThisShouldGo
 runtest " --delete" 'checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}'
 
 checkforlogs ${LOG}.?
+
+hands_cleanup
\ No newline at end of file
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 8f8e7d3c..cf22a975 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -53,7 +53,8 @@ hands_setup() {
     # Clean before creation
     rm -rf $FROM
     rm -rf $TO
-    
+
+    [ -d $TMP ] || mkdir $TMP
     [ -d $FROM ] || mkdir $FROM
     [ -d $TO ] || mkdir $TO
 
@@ -72,7 +73,7 @@ hands_setup() {
     mkdir ${FROM}/emptydir
 
     # a hundred lines of text or so
-    rsync_ls_lR ${srcdir} > ${FROM}/filelist
+    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
@@ -94,6 +95,11 @@ hands_setup() {
 }
 
 
+hands_cleanup() {
+    rm -r "$TMP"
+}
+
+
 
 
 ####################
@@ -149,8 +155,8 @@ checkit() {
     echo "-------------">>${log}
     echo "check how the directory listings compare with diff:">>${log}
     echo "">>${log}
-    ( cd "$2" && rsync_ls_lR ) > ${TMP}/ls-from 2>>${log}
-    ( cd "$3" && rsync_ls_lR ) > ${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
 	rm $log
@@ -204,3 +210,5 @@ EOF
 }
 
 
+# be reproducible
+umask 077
\ No newline at end of file