Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A few minor changes to some messages and a couple variable improvements.
[rsync/rsync.git]
/
runtests.sh
diff --git
a/runtests.sh
b/runtests.sh
index
f6d86f7
..
0056de9
100755
(executable)
--- a/
runtests.sh
+++ b/
runtests.sh
@@
-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
# 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
# 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)
# 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:
# STILL TO DO:
@@
-161,11
+163,13
@@
else
echo " preserve_scratch=no"
fi
echo " preserve_scratch=no"
fi
-#
We'll use setfacl if it's around and it supports the -k
option.
+#
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
if setfacl --help 2>/dev/null | grep ' -k,' >/dev/null; then
- setfacl=setfacl
+ 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
else
- setfacl=true
+ setfacl
_nodef
=true
fi
if [ ! -f "$rsync_bin" ]; then
fi
if [ ! -f "$rsync_bin" ]; then
@@
-181,7
+185,7
@@
fi
RSYNC="$rsync_bin"
#RSYNC="valgrind --tool=addrcheck $rsync_bin"
RSYNC="$rsync_bin"
#RSYNC="valgrind --tool=addrcheck $rsync_bin"
-export rsync_bin RSYNC
+export rsync_bin RSYNC
setfacl_nodef
skipped=0
missing=0
skipped=0
missing=0
@@
-202,7
+206,7
@@
prep_scratch() {
[ -d "$scratchdir" ] && rm -rf "$scratchdir"
mkdir "$scratchdir"
# Get rid of default ACLs and dir-setgid to avoid confusing some tests.
[ -d "$scratchdir" ] && rm -rf "$scratchdir"
mkdir "$scratchdir"
# Get rid of default ACLs and dir-setgid to avoid confusing some tests.
- $setfacl
-k
"$scratchdir"
+ $setfacl
_nodef
"$scratchdir"
chmod g-s "$scratchdir"
return 0
}
chmod g-s "$scratchdir"
return 0
}