X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7753ca1f492e6319436c712f951f83a21949dfb7..ecc7623e7faf75f6ba3dd7b5a416c52e2346ac7d:/runtests.sh diff --git a/runtests.sh b/runtests.sh index ab6f77a5..bb8d98cd 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,6 +1,7 @@ #! /bin/sh -# Copyright (C) 2001 by Martin Pool +# Copyright (C) 2001, 2002 by Martin Pool +# Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version @@ -13,8 +14,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # rsync top-level test script -- this invokes all the other more # detailed tests in order. This script can either be called by `make @@ -85,7 +85,7 @@ # they're explicitly given on the command line. # Also, we can't count on 'cp -a' or 'mkdir -p', although they're -# pretty handy. +# pretty handy (see function makepath for the latter). # I think some of the GNU documentation suggests that we shouldn't # rely on shell functions. However, the Bash manual seems to say that @@ -100,6 +100,8 @@ # You cannot do "export VAR=VALUE" all on one line; the export must be # separate from the assignment. (SCO SysV) +# Don't rely on grep -q, as that doesn't work everywhere -- just redirect +# stdout to /dev/null to keep it quiet. # STILL TO DO: @@ -124,11 +126,13 @@ set -e . "./shconfig" RUNSHFLAGS='-e' +export RUNSHFLAGS -if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ] -then - if set -x - then +# for Solaris +[ -d /usr/xpg4/bin ] && PATH="/usr/xpg4/bin/:$PATH" + +if [ "x$loglevel" != x ] && [ "$loglevel" -gt 8 ]; then + if set -x; then # If it doesn't work the first time, don't keep trying. RUNSHFLAGS="$RUNSHFLAGS -x" fi @@ -139,72 +143,134 @@ echo "$0 running in `pwd`" echo " rsync_bin=$rsync_bin" echo " srcdir=$srcdir" -if test ! -f $rsync_bin -then +if [ -f /usr/bin/whoami ]; then + testuser=`/usr/bin/whoami` +elif [ -f /usr/ucb/whoami ]; then + testuser=`/usr/ucb/whoami` +elif [ -f /bin/whoami ]; then + testuser=`/bin/whoami` +else + testuser=`id -un 2>/dev/null || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}` +fi + +echo " testuser=$testuser" +echo " os=`uname -a`" + +# It must be "yes", not just nonnull +if [ "x$preserve_scratch" = xyes ]; then + echo " preserve_scratch=yes" +else + echo " preserve_scratch=no" +fi + +# Check if setfacl is around and if it supports the -k or -s option. +if setfacl --help 2>/dev/null | grep ' -k,' >/dev/null; then + setfacl_nodef='setfacl -k' +elif setfacl -s u::7,g::5,o:5 testsuite 2>/dev/null; then + setfacl_nodef='setfacl -s u::7,g::5,o:5' +else + setfacl_nodef=true +fi + +if [ ! -f "$rsync_bin" ]; then echo "rsync_bin $rsync_bin is not a file" >&2 exit 2 fi -if test ! -d $srcdir -then +if [ ! -d "$srcdir" ]; then echo "srcdir $srcdir is not a directory" >&2 exit 2 fi RSYNC="$rsync_bin" +#RSYNC="valgrind --tool=addrcheck $rsync_bin" -export rsync_bin RSYNC +export rsync_bin RSYNC setfacl_nodef skipped=0 missing=0 passed=0 failed=0 -scratchdir="`pwd`"/testtmp -echo " scratchdir=$scratchdir" +# Prefix for scratch directory. We create separate directories for +# each test case, so that they can be left behind in case of failure +# to aid investigation. +scratchbase="`pwd`"/testtmp +echo " scratchbase=$scratchbase" suitedir="$srcdir/testsuite" export scratchdir suitedir -clean_scratch() { +prep_scratch() { [ -d "$scratchdir" ] && rm -rf "$scratchdir" mkdir "$scratchdir" + # Get rid of default ACLs and dir-setgid to avoid confusing some tests. + $setfacl_nodef "$scratchdir" + chmod g-s "$scratchdir" + return 0 } -if [ "x$whichtests" = x ] -then +maybe_discard_scratch() { + [ x"$preserve_scratch" != xyes ] && [ -d "$scratchdir" ] && rm -rf "$scratchdir" + return 0 +} + +if [ "x$whichtests" = x ]; then whichtests="*.test" fi for testscript in $suitedir/$whichtests do - testbase=`echo $testscript | sed 's!.*/!!'` + testbase=`echo $testscript | sed -e 's!.*/!!' -e 's/.test\$//'` + scratchdir="$scratchbase.$testbase" + + prep_scratch - echo "----- $testbase starting" - clean_scratch + set +e + sh $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1 + result=$? + set -e - if sh $RUNSHFLAGS "$testscript" >"$scratchdir/test.log" 2>&1 + if [ "x$always_log" = xyes -o \( $result != 0 -a $result != 77 -a $result != 78 \) ] then - echo "----- $testbase completed successfully" - passed=`expr $passed + 1` - else - case $? in - 77) - echo "----- $testbase skipped" - skipped=`expr $skipped + 1` - ;; - *) - echo "----- $testbase failed: log follows" - cat "$scratchdir/test.log" - echo "----- $testbase log ends" - failed=`expr $failed + 1` - if [ "x$nopersist" = "xyes" ] - then - exit 1 - fi - esac + echo "----- $testbase log follows" + cat "$scratchdir/test.log" + echo "----- $testbase log ends" + if [ -f "$scratchdir/rsyncd.log" ]; then + echo "----- $testbase rsyncd.log follows" + cat "$scratchdir/rsyncd.log" + echo "----- $testbase rsyncd.log ends" + fi fi + + case $result in + 0) + echo "PASS $testbase" + passed=`expr $passed + 1` + maybe_discard_scratch + ;; + 77) + # backticks will fill the whole file onto one line, which is a feature + whyskipped=`cat "$scratchdir/whyskipped"` + echo "SKIP $testbase ($whyskipped)" + skipped=`expr $skipped + 1` + maybe_discard_scratch + ;; + 78) + # It failed, but we expected that. don't dump out error logs, + # because most users won't want to see them. But do leave + # the working directory around. + echo "XFAIL $testbase" + failed=`expr $failed + 1` + ;; + *) + echo "FAIL $testbase" + failed=`expr $failed + 1` + if [ "x$nopersist" = xyes ]; then + exit 1 + fi + esac done echo '------------------------------------------------------------'