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
Various xattr fixes:
[rsync/rsync.git]
/
testsuite
/
rsync.fns
diff --git
a/testsuite/rsync.fns
b/testsuite/rsync.fns
index
a1902b7
..
e5ae719
100644
(file)
--- a/
testsuite/rsync.fns
+++ b/
testsuite/rsync.fns
@@
-52,10
+52,13
@@
runtest() {
# messages). This isn't needed if you use -i without -v.
filter_outfile() {
sed -e '/^building file list /d' \
# messages). This isn't needed if you use -i without -v.
filter_outfile() {
sed -e '/^building file list /d' \
+ -e '/^sending incremental file list/d' \
-e '/^created directory /d' \
-e '/^done$/d' \
-e '/ --whole-file$/d' \
-e '/^total: /d' \
-e '/^created directory /d' \
-e '/^done$/d' \
-e '/ --whole-file$/d' \
-e '/^total: /d' \
+ -e '/^client charset: /d' \
+ -e '/^server charset: /d' \
-e '/^$/,$d' \
<"$outfile" >"$outfile.new"
mv "$outfile.new" "$outfile"
-e '/^$/,$d' \
<"$outfile" >"$outfile.new"
mv "$outfile.new" "$outfile"
@@
-66,11
+69,17
@@
printmsg() {
}
rsync_ls_lR() {
}
rsync_ls_lR() {
- find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
+ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
$TLS_ARGS
}
check_perms() {
}
check_perms() {
- "$TOOLDIR/tls" "$1" | grep "^-$2" >/dev/null
+ perms=`"$TOOLDIR/tls" "$1" | sed 's/^[-d]\(.........\).*/\1/'`
+ if test $perms = $2; then
+ return 0
+ fi
+ echo "permissions: $perms on $1"
+ echo "should be: $2"
+ test_fail "failed test $3"
}
rsync_getgroups() {
}
rsync_getgroups() {
@@
-138,17
+147,17
@@
hands_setup() {
####################
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
####################
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
-makepath
() {
- echo " makepath $1"
-
p="$1
"
- (
+makepath() {
+ for p in "${@}"; do
+
(echo " makepath $p
"
+
# Absolut Unix.
if echo $p | grep '^/' >/dev/null
then
cd /
fi
# Absolut Unix.
if echo $p | grep '^/' >/dev/null
then
cd /
fi
- # This will break if $
1
contains a space.
+ # This will break if $
p
contains a space.
for c in `echo $p | tr '/' ' '`
do
if [ -d "$c" ] || mkdir "$c"
for c in `echo $p | tr '/' ' '`
do
if [ -d "$c" ] || mkdir "$c"
@@
-157,8
+166,8
@@
makepath () {
else
echo "failed to create $c" >&2; return $?
fi
else
echo "failed to create $c" >&2; return $?
fi
- done
- )
+ done
)
+ done
}
}
@@
-218,17
+227,19
@@
build_rsyncd_conf() {
port=2612
pidfile="$scratchdir/rsyncd.pid"
logfile="$scratchdir/rsyncd.log"
port=2612
pidfile="$scratchdir/rsyncd.pid"
logfile="$scratchdir/rsyncd.log"
+ hostname=`uname -n`
cat >"$conf" <<EOF
# rsyncd configuration file autogenerated by $0
pid file = $pidfile
use chroot = no
cat >"$conf" <<EOF
# rsyncd configuration file autogenerated by $0
pid file = $pidfile
use chroot = no
-hosts allow = localhost
, 127.0.0.1
+hosts allow = localhost
127.0.0.0/24 192.168.0.0/16 10.0.0.0/8 $hostname
log file = $logfile
log file = $logfile
+log format = %i %h [%a] %m (%u) %l %f%L
+transfer logging = yes
exclude = foobar.baz
max verbosity = 9
exclude = foobar.baz
max verbosity = 9
-
uid = 0
gid = 0
uid = 0
gid = 0
@@
-239,6
+250,10
@@
gid = 0
[test-to]
path = $todir
read only = no
[test-to]
path = $todir
read only = no
+
+[test-scratch]
+ path = $scratchdir
+ read only = no
EOF
}
EOF
}