diff options
| author | Martin Pool <mbp@samba.org> | 2001-11-27 06:51:51 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2001-11-27 06:51:51 +0000 |
| commit | 57835c00ad83d218d12dc6c777c5d9f66b926d3f (patch) | |
| tree | 0d3b46fa354106041f0e076a03cb6cb454b9184d | |
| parent | 4ed886ae6ef86b4eba3a2a92e441261c42969cbf (diff) | |
| download | rsync-57835c00ad83d218d12dc6c777c5d9f66b926d3f.tar.gz | |
Use tls rather than the OS's ls(1) so that we have more chance of
reproducible results.
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | testsuite/rsync.fns | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index f61468eb..77146f66 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,13 +119,13 @@ test: check # might lose in the future where POSIX diverges from old sh. check: all $(CHECK_PROGS) - POSIXLY_CORRECT=1 rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh + POSIXLY_CORRECT=1 TLS=`pwd`/tls rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh # This does *not* depend on building or installing: you can use it to # check a version installed from a binary or some other source tree, # if you want. installcheck: $(CHECK_PROGS) - POSIXLY_CORRECT=1 rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh + POSIXLY_CORRECT=1 TLS=`pwd`/tls rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh # TODO: Add 'dist' target; need to know which files will be included diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index f2cdd47e..7508ce8e 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -41,6 +41,11 @@ printmsg() { } +rsync_ls_lR { + find "$@" -print | sort | xargs $TLS +} + + #################### # Build test directories TO and FROM, with FROM full of files. @@ -67,7 +72,7 @@ hands_setup() { mkdir ${FROM}/emptydir # a hundred lines of text or so - 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 @@ -139,8 +144,8 @@ checkit() { echo "-------------">>${log} echo "check how the directory listings compare with diff:">>${log} echo "">>${log} - ( cd $2 ; ls -laR ) > ${TMP}/ls-from 2>>${log} - ( cd $3 ; ls -laR ) > ${TMP}/ls-to 2>>${log} + ( rsync_ls_lR "$2" ) > ${TMP}/ls-from 2>>${log} + ( rsync_ls_lR "$3" ) > ${TMP}/ls-to 2>>${log} diff -c ${TMP}/ls-from ${TMP}/ls-to >>${log} 2>&1 || failed=YES if [ -z "${failed}" ] ; then rm $log |