From e553d27f41edd990622479b386e9ba991eda30fb Mon Sep 17 00:00:00 2001 From: Martin Pool Date: Tue, 26 Mar 2002 10:28:57 +0000 Subject: [PATCH] Fix suggested by Jos for hands.test. Some of the functionality previously built into Phil's test was clashing with the runtests.sh framework. I think one of the core problems might be that scripts which don't explicitly "exit 0" have return codes which vary depending on the particular shell. (c.f. the autoconf portability guide.) This might break the Debian test suite but I'm afraid I don't know enough about how it works yet. Hopefully eventually it can become just a wrapper around our 'make check'. --- testsuite/hands.test | 8 ++------ testsuite/rsync.fns | 22 ---------------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/testsuite/hands.test b/testsuite/hands.test index fced34a9..4705641c 100644 --- a/testsuite/hands.test +++ b/testsuite/hands.test @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright (C) 1998,1999 Philip Hands -# Copyright (C) 2001 by Martin Pool +# Copyright (C) 1998, 1999 by Philip Hands +# Copyright (C) 2001, 2002 by Martin Pool # # This program is distributable under the terms of the GNU GPL (see COPYING) @@ -24,7 +24,3 @@ runtest "extra data" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}' 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 1bb23f97..1d748aea 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -102,13 +102,6 @@ hands_setup() { } -hands_cleanup() { - rm -r "$TMP" -} - - - - #################### # Many machines do not have "mkdir -p", so we have to build up long paths. # How boring. @@ -181,21 +174,6 @@ checkit() { } -# In fact, we need a more general feature of capturing all stderr/log files, -# and dumping them if something goes wrong. - -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 - fi -} - - build_rsyncd_conf() { # Build an appropriate configuration file conf="$scratchdir/test-rsyncd.conf" -- 2.34.1