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
Check the "keep_dirs" var instead of "recurse" to decide if
[rsync/rsync.git]
/
testsuite
/
trimslash.test
diff --git
a/testsuite/trimslash.test
b/testsuite/trimslash.test
index
cf11840
..
56e79cc
100644
(file)
--- a/
testsuite/trimslash.test
+++ b/
testsuite/trimslash.test
@@
-7,7
+7,7
@@
# Test tiny function to trim trailing slashes.
# Test tiny function to trim trailing slashes.
-.
$srcdir/testsuite/rsync.fns
+.
"$suitedir/rsync.fns"
set -x
set -x
@@
-15,7
+15,7
@@
set -x
"//a//" "////" \
"/Users/Wierd Macintosh Name/// Ooh, translucent plastic/" \
> "$scratchdir/slash.out"
"//a//" "////" \
"/Users/Wierd Macintosh Name/// Ooh, translucent plastic/" \
> "$scratchdir/slash.out"
-diff
-c
"$scratchdir/slash.out" - <<EOF
+diff
$diffopt
"$scratchdir/slash.out" - <<EOF
/usr/local/bin
/usr/local/bin
/usr/local/bin
/usr/local/bin
/usr/local/bin
/usr/local/bin
@@
-24,6
+24,5
@@
diff -c "$scratchdir/slash.out" - <<EOF
/Users/Wierd Macintosh Name/// Ooh, translucent plastic
EOF
/Users/Wierd Macintosh Name/// Ooh, translucent plastic
EOF
+# The script would have aborted on error, so getting here means we've won.
exit 0
exit 0
-# last [] may have failed but if we get here then we've won
-