From e8ca59014212d539dbddcdf6d0d320d70fc2857c Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Wed, 29 Aug 2001 09:18:45 +0000 Subject: [PATCH] Cleanup check_logs feature. `ps ax' is not portable -- don't use it to generate random text. Use `ls -lR' instead. --- testsuite/hands.test | 23 ++--------------------- testsuite/rsync.fns | 4 +++- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/testsuite/hands.test b/testsuite/hands.test index b9c68c46..aeb208d3 100644 --- a/testsuite/hands.test +++ b/testsuite/hands.test @@ -1,38 +1,19 @@ #!/bin/sh # Copyright (C) 1998,1999 Philip Hands +# Copyright (C) 2001 by Martin Pool # # This program is distributable under the terms of the GNU GPL (see COPYING) -# -# This is a simple test script that tests a few rsync -# features to make sure I haven't broken them before a release. -# -# . "$suitedir/rsync.fns" hands_setup - -checkforlogs() { - # skip it if we're under debian-test - if test -n "${Debian}" ; then return 0 ; fi - - if [ -f $1 -a -s $1 ] ; then - echo "Failures have occurred. $1 follows:" >&2 - cat $1 >&2 - exit 1 - else - echo "" - echo "Tests Completed Successfully :-)" - fi -} - # Main script starts here runtest "basic operation" 'checkit "$RSYNC -av ${FROM}/ ${TO}" ${FROM}/ ${TO}' -ln ${FROM}/pslist ${FROM}/dir +ln ${FROM}/filelist ${FROM}/dir runtest "hard links" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}' rm ${TO}/${F1} diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index 3cbb7687..85e1fbe7 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -27,7 +27,9 @@ hands_setup() { # set up test data touch ${FROM}/empty mkdir ${FROM}/emptydir - ps ax > ${FROM}/pslist + + # a few hundred lines of test + ls -lR / | head -200 > ${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 -- 2.34.1