The branch, master has been updated via e9899dbd Add strict (no-skipping) checks and use them. via 18cffa8a A couple minor changes. from 7e07a325 Add the `name converter` daemon parameter.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e9899dbdb43d26fad8551200f062f9d8deae2c71 Author: Wayne Davison <wa...@opencoder.net> Date: Fri Jul 17 11:18:35 2020 -0700 Add strict (no-skipping) checks and use them. commit 18cffa8aa98b85f1c90976fc29bdd8cb52abd2d2 Author: Wayne Davison <wa...@opencoder.net> Date: Fri Jul 17 10:56:22 2020 -0700 A couple minor changes. ----------------------------------------------------------------------- Summary of changes: .github/workflows/build.yml | 6 +++--- Makefile.in | 18 +++++++++--------- lib/sysacls.h | 2 +- packaging/auto-Makefile | 3 ++- runtests.sh | 13 ++++++++++++- support/git-set-file-times | 4 ++-- 6 files changed, 29 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44f9f72c..182fa6c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,11 +27,11 @@ jobs: - name: info run: rsync --version - name: check - run: sudo make check + run: sudo make strict_check - name: check30 - run: sudo make check30 + run: sudo make strict_check30 - name: check29 - run: sudo make check29 + run: sudo make strict_check29 - name: ssl file list run: rsync-ssl --no-motd download.samba.org::rsyncftp/ || true diff --git a/Makefile.in b/Makefile.in index 0f17aa16..07479ca2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -295,17 +295,17 @@ test: check # catch Bash-isms earlier even if we're running on GNU. Of course, we # might lose in the future where POSIX diverges from old sh. -.PHONY: check -check: all $(CHECK_PROGS) $(CHECK_SYMLINKS) - rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh +.PHONY: check strict_check +check strict_check: all $(CHECK_PROGS) $(CHECK_SYMLINKS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh $@ -.PHONY: check29 -check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS) - rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=29 +.PHONY: check29 strict_check29 +check29 strict_check29: all $(CHECK_PROGS) $(CHECK_SYMLINKS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh $@ --protocol=29 -.PHONY: check30 -check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS) - rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh --protocol=30 +.PHONY: check30 strict_check30 +check30 strict_check30: all $(CHECK_PROGS) $(CHECK_SYMLINKS) + rsync_bin=`pwd`/rsync$(EXEEXT) $(srcdir)/runtests.sh $@ --protocol=30 wildtest.o: wildtest.c t_stub.o lib/wildmatch.c rsync.h config.h wildtest$(EXEEXT): wildtest.o lib/compat.o lib/snprintf.o @BUILD_POPT@ diff --git a/lib/sysacls.h b/lib/sysacls.h index 9c08255e..8865dae4 100644 --- a/lib/sysacls.h +++ b/lib/sysacls.h @@ -3,7 +3,7 @@ * Version 2.2.x * Portable SMB ACL interface * Copyright (C) Jeremy Allison 2000 - * Copyright (C) 2007-2019 Wayne Davison + * Copyright (C) 2007-2020 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/packaging/auto-Makefile b/packaging/auto-Makefile index cc181536..5e3322a2 100644 --- a/packaging/auto-Makefile +++ b/packaging/auto-Makefile @@ -1,5 +1,6 @@ TARGETS := all install install-ssl-daemon install-all install-strip conf gen gensend reconfigure restatus \ - proto man clean cleantests distclean test check check29 check30 installcheck splint doxygen doxygen-upload + proto man clean cleantests distclean test check check29 check30 strict_check strict_check29 strict_check30 \ + installcheck splint doxygen doxygen-upload .PHONY: $(TARGETS) auto-prep diff --git a/runtests.sh b/runtests.sh index d5a174cb..518ee495 100755 --- a/runtests.sh +++ b/runtests.sh @@ -162,6 +162,13 @@ 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 $*" @@ -338,6 +345,10 @@ echo '------------------------------------------------------------' # we want, and if we just call expr then this script will always fail, # because -e is set. -result=`expr $failed + $missing || true` +if test -z "$RSYNC_FAIL_ON_SKIPPED"; then + result=`expr $failed + $missing || true` +else + result=`expr $failed + $missing + $skipped || true` +fi echo "overall result is $result" exit $result diff --git a/support/git-set-file-times b/support/git-set-file-times index b4c98c5d..51962d37 100755 --- a/support/git-set-file-times +++ b/support/git-set-file-times @@ -79,10 +79,10 @@ def print_line(fn, mtime, commit_time): if __name__ == '__main__': - parser = argparse.ArgumentParser(description="Set the times of the current git checkout to their last-changed time.", add_help=False) + parser = argparse.ArgumentParser(description="Set the times of the files in the current git checkout to their last-changed time.", add_help=False) parser.add_argument('--git-dir', metavar='GIT_DIR', help="The git dir to query (defaults to affecting the current git checkout).") parser.add_argument('--tree', metavar='TREE-ISH', help="The tree-ish to query (defaults to the current branch).") - parser.add_argument('--prefix', metavar='PREFIX_STR', help="Prepend the PREFIX_STR to each filename we tweak.") + parser.add_argument('--prefix', metavar='PREFIX_STR', help="Prepend the PREFIX_STR to each filename we tweak (defaults to the top of current checkout).") parser.add_argument('--quiet', '-q', action='store_true', help="Don't output the changed-file information.") parser.add_argument('--list', '-l', action='count', help="List files & times instead of changing them. Repeat for Unix timestamp instead of human readable.") parser.add_argument('files', metavar='FILE', nargs='*', help="Specify a subset of checked-out files to tweak.") -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs