From 96ed96dabda2e535929eb69ab5f38b057650ef47 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 25 May 2020 23:42:33 -0700 Subject: Fix the parsing of the --version capabilities. --- testsuite/acls.test | 2 +- testsuite/chown.test | 2 +- testsuite/default-acls.test | 2 +- testsuite/devices.test | 2 +- testsuite/itemize.test | 2 +- testsuite/xattrs.test | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'testsuite') 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*) -- cgit v1.2.1