summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorWayne Davison <wayne@opencoder.net>2020-05-25 23:42:33 -0700
committerWayne Davison <wayne@opencoder.net>2020-05-25 23:42:51 -0700
commit96ed96dabda2e535929eb69ab5f38b057650ef47 (patch)
tree621e63a540104d3b51a201381ea119e9cf839332 /testsuite
parent8ad2ca9ae2220d795ae7f96fdbb4d9c8353ec414 (diff)
downloadrsync-96ed96dabda2e535929eb69ab5f38b057650ef47.tar.gz
Fix the parsing of the --version capabilities.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/acls.test2
-rw-r--r--testsuite/chown.test2
-rw-r--r--testsuite/default-acls.test2
-rw-r--r--testsuite/devices.test2
-rw-r--r--testsuite/itemize.test2
-rw-r--r--testsuite/xattrs.test2
6 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/acls.test b/testsuite/acls.test
index 40490a67..5728cd57 100644
--- a/testsuite/acls.test
+++ b/testsuite/acls.test
@@ -7,7 +7,7 @@
. $suitedir/rsync.fns
-$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
+$RSYNC --version | grep "[, ] ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
makepath "$fromdir/foo"
echo something >"$fromdir/file1"
diff --git a/testsuite/chown.test b/testsuite/chown.test
index 30a3a94d..aa4958d8 100644
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -15,7 +15,7 @@
case $0 in
*fake*)
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync needs xattrs for fake device tests"
+ $RSYNC --version | grep "[, ] xattrs" >/dev/null || test_skipped "Rsync needs xattrs for fake device tests"
RSYNC="$RSYNC --fake-super"
TLS_ARGS="$TLS_ARGS --fake-super"
case "$HOST_OS" in
diff --git a/testsuite/default-acls.test b/testsuite/default-acls.test
index eb41a6ff..17893f93 100644
--- a/testsuite/default-acls.test
+++ b/testsuite/default-acls.test
@@ -7,7 +7,7 @@
. $suitedir/rsync.fns
-$RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
+$RSYNC --version | grep "[, ] ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
case "$setfacl_nodef" in
true) test_skipped "I don't know how to use your setfacl command" ;;
diff --git a/testsuite/devices.test b/testsuite/devices.test
index a9245138..0af0428b 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -16,7 +16,7 @@ outfile="$scratchdir/rsync.out"
case $0 in
*fake*)
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync needs xattrs for fake device tests"
+ $RSYNC --version | grep "[, ] xattrs" >/dev/null || test_skipped "Rsync needs xattrs for fake device tests"
RSYNC="$RSYNC --fake-super"
TLS_ARGS="$TLS_ARGS --fake-super"
case "$HOST_OS" in
diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 78637ca4..3a5af1c3 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -40,7 +40,7 @@ case "$RSYNC" in
T=.T
;;
*)
- if $RSYNC --version | grep ", symtimes" >/dev/null; then
+ if $RSYNC --version | grep "[, ] symtimes" >/dev/null; then
T=.t
else
T=.T
diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index 86165e0c..5931ffcd 100644
--- a/testsuite/xattrs.test
+++ b/testsuite/xattrs.test
@@ -8,7 +8,7 @@
. $suitedir/rsync.fns
lnkdir="$tmpdir/lnk"
-$RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync is configured without xattr support"
+$RSYNC --version | grep "[, ] xattrs" >/dev/null || test_skipped "Rsync is configured without xattr support"
case "$HOST_OS" in
darwin*)