The branch, master has been updated via a61ffbaf Make sure the tmpdir2 dir is writable. via 190b4746 Mention how to run a single test. via 85e90b0f Update copyright year in runtests.sh too. from 516ca6a4 Add support for /run/shm/tmp dir so the CI action doesn't skip a test.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit a61ffbafe5682b65d4a2a8846e9ec20298ba7e17 Author: Wayne Davison <wa...@opencoder.net> Date: Wed Jun 10 13:58:43 2020 -0700 Make sure the tmpdir2 dir is writable. commit 190b474610a860ee9d638f5a537a61dedb4ac1b4 Author: Wayne Davison <wa...@opencoder.net> Date: Wed Jun 10 13:57:25 2020 -0700 Mention how to run a single test. commit 85e90b0f8039515121234e529a55e86388cf287b Author: Wayne Davison <wa...@opencoder.net> Date: Wed Jun 10 13:58:42 2020 -0700 Update copyright year in runtests.sh too. ----------------------------------------------------------------------- Summary of changes: packaging/year-tweak | 6 +++--- runtests.sh | 25 +++++++++++++++++-------- testsuite/chmod-temp-dir.test | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/packaging/year-tweak b/packaging/year-tweak index aff72aa4..6bd6f130 100755 --- a/packaging/year-tweak +++ b/packaging/year-tweak @@ -22,7 +22,7 @@ def main(): m = argparse.Namespace(**m.groupdict()) if m.year > latest_year: latest_year = m.year - if not re.search(r'\.(c|h|[1-9])$', m.fn) or m.fn.startswith('zlib/'): + if not re.search(r'\.(c|h|sh)$', m.fn) or m.fn.startswith('zlib/'): continue maybe_edit_copyright_year(m.fn, m.year) proc.communicate() @@ -43,9 +43,9 @@ def maybe_edit_copyright_year(fn, year): copyright_line = None with open(fn, 'r', encoding='utf-8') as fh: - for line in fh: + for lineno, line in enumerate(fh): opening_lines.append(line) - if not re.search(r'\S', line): + if lineno > 3 and not re.search(r'\S', line): break m = re.match(r'^(?P<pre>.*Copyright\s+\S+\s+)(?P<year>\d\d\d\d(?:-\d\d\d\d)?(,\s+\d\d\d\d)*)(?P<suf>.+)', line) if not m: diff --git a/runtests.sh b/runtests.sh index 42cd866e..536543f8 100755 --- a/runtests.sh +++ b/runtests.sh @@ -1,7 +1,7 @@ #! /bin/sh # Copyright (C) 2001, 2002 by Martin Pool <m...@samba.org> -# Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison +# Copyright (C) 2003-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 version @@ -11,16 +11,22 @@ # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. -# +# # 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., 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 # check' or `make installcheck'. `check' runs against the copies of # the program and other files in the build directory, and -# `installcheck' against the installed copy of the program. +# `installcheck' against the installed copy of the program. + +# It can also be called on a single test file using a run like this: +# +# preserve_scratch=yes whichtests=itemize.test ./runtests.sh # In either case we need to also be able to find the source directory, # since we read test scripts and possibly other information from @@ -47,7 +53,7 @@ # build scripts. At the moment we assume we are invoked from the # source directory. -# This script must be invoked from the build directory. +# This script must be invoked from the build directory. # A scratch directory, 'testtmp', is used in the build directory to # hold per-test subdirectories. @@ -57,10 +63,11 @@ # Make command line. It's also set by the build farm to give more # detail for failing builds. +# ------------------------------------------------------------------------- # NOTES FOR TEST CASES: -# Each test case runs in its own shell. +# Each test case runs in its own shell. # Exit codes from tests: @@ -75,6 +82,7 @@ # rsync.fns contains some general setup functions and definitions. +# ------------------------------------------------------------------------- # NOTES ON PORTABILITY: @@ -103,6 +111,7 @@ # 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: @@ -141,7 +150,7 @@ if [ "x$loglevel" != x ] && [ "$loglevel" -gt 8 ]; then fi fi -POSIXLY_CORRECT=1 +POSIXLY_CORRECT=1 if test x"$TOOLDIR" = x; then TOOLDIR=`pwd` fi @@ -191,7 +200,7 @@ if [ "x$preserve_scratch" = xyes ]; then echo " preserve_scratch=yes" else echo " preserve_scratch=no" -fi +fi # Check if setacl/setfacl is around and if it supports the -k or -s option. if setacl -k u::7,g::5,o:5 testsuite 2>/dev/null; then @@ -301,7 +310,7 @@ do maybe_discard_scratch ;; 78) - # It failed, but we expected that. don't dump out error logs, + # 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" diff --git a/testsuite/chmod-temp-dir.test b/testsuite/chmod-temp-dir.test index 1e05bcb5..085ab008 100644 --- a/testsuite/chmod-temp-dir.test +++ b/testsuite/chmod-temp-dir.test @@ -17,7 +17,7 @@ sdev=`$TOOLDIR/getfsdev $scratchdir` tdev=$sdev for tmpdir2 in "${RSYNC_TEST_TMP:-/override-tmp-not-specified}" /run/shm/tmp /var/tmp /tmp; do - [ -d "$tmpdir2" ] || continue + [ -d "$tmpdir2" -a -w "$tmpdir2" ] || continue tdev=`$TOOLDIR/getfsdev "$tmpdir2"` [ x$sdev != x$tdev ] && break done -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs