diff options
| author | Wayne Davison <wayne@opencoder.net> | 2020-07-22 10:59:15 -0700 |
|---|---|---|
| committer | Wayne Davison <wayne@opencoder.net> | 2020-07-22 11:00:26 -0700 |
| commit | 8779d6c8bb23c643c805fc9aaa5873ee64a98cd7 (patch) | |
| tree | f5188cef54b381e832284742ddc99172468d5831 /runtests.sh | |
| parent | 96be713fd23bb1c39a66a031596bfee04be7995b (diff) | |
| download | rsync-8779d6c8bb23c643c805fc9aaa5873ee64a98cd7.tar.gz | |
Switch to RSYNC_MAX_SKIPPED test setting.
Diffstat (limited to 'runtests.sh')
| -rwxr-xr-x | runtests.sh | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/runtests.sh b/runtests.sh index 518ee495..ecb383e8 100755 --- a/runtests.sh +++ b/runtests.sh @@ -162,13 +162,6 @@ if test x"$rsync_bin" = x; then rsync_bin="$TOOLDIR/rsync" fi -if test $# -ge 1; then - case "$1" in - strict*) RSYNC_FAIL_ON_SKIPPED=yes ; shift ;; - check*) shift ;; - esac -fi - # This allows the user to specify extra rsync options -- use carefully! RSYNC="$rsync_bin $*" #RSYNC="valgrind $rsync_bin $*" @@ -345,10 +338,9 @@ echo '------------------------------------------------------------' # we want, and if we just call expr then this script will always fail, # because -e is set. -if test -z "$RSYNC_FAIL_ON_SKIPPED"; then - result=`expr $failed + $missing || true` -else - result=`expr $failed + $missing + $skipped || true` +result=`expr $failed + $missing || true` +if [ "$result" = 0 -a "$skipped" -gt "${RSYNC_MAX_SKIPPED:-9999}" ]; then + result=1 fi echo "overall result is $result" exit $result |