diff -uprk.orig cvs-1.11.10.orig/src/sanity.sh cvs-1.11.10/src/sanity.sh --- cvs-1.11.10.orig/src/sanity.sh 2003-12-21 02:44:26 +0300 +++ cvs-1.11.10/src/sanity.sh 2003-12-21 02:48:57 +0300 @@ -229,20 +229,25 @@ fi # CVS="${testcvs} -Q" -LOGFILE=`pwd`/check.log +if $remote; then + CHECK_LOG=check-r.log +else + CHECK_LOG=check.log +fi +LOGFILE=`pwd`/$CHECK_LOG # Save the previous log in case the person running the tests decides # they want to look at it. The extension ".plog" is chosen for consistency # with dejagnu. -if test -f check.log; then - mv check.log check.plog +if test -f $CHECK_LOG; then + mv $CHECK_LOG $CHECK_LOG.orig fi -# Create the log file so check.log can be tailed almost immediately after +# Create the log file so $CHECK_LOG can be tailed almost immediately after # this script is started. Otherwise it can take up to a minute or two before # the log file gets created when $remotehost is specified on some systems, # which makes for a lot of failed `tail -f' attempts. -touch check.log +touch $CHECK_LOG # Now: # 1) Set TESTDIR if it's not set already @@ -511,7 +516,7 @@ pass () fail () { echo "FAIL: $1" | tee -a ${LOGFILE} - echo "*** Please see the \`TESTS' and \`check.log' files for more information." >&2 + echo "*** Please see the \`TESTS' and \`$CHECK_LOG' files for more information." >&2 # This way the tester can go and see what remnants were left exit 1 }