diff options
author | Wayne Davison <wayne@opencoder.net> | 2022-10-20 09:02:28 -0700 |
---|---|---|
committer | Wayne Davison <wayne@opencoder.net> | 2022-10-20 09:09:26 -0700 |
commit | ebe1af749cf8debca9ca90f09306a67cac9c9d4d (patch) | |
tree | 27191cc788e2b086829d2914c627ad0e3383826e | |
parent | de6848ed97760de988e2a41af4d66bc4fd0f1995 (diff) | |
download | rsync-ebe1af749cf8debca9ca90f09306a67cac9c9d4d.tar.gz |
Make use of -VV when checking rsync capabilities.
-rw-r--r-- | testsuite/acls-default.test | 2 | ||||
-rw-r--r-- | testsuite/acls.test | 2 | ||||
-rw-r--r-- | testsuite/atimes.test | 2 | ||||
-rw-r--r-- | testsuite/chown.test | 2 | ||||
-rw-r--r-- | testsuite/crtimes.test | 2 | ||||
-rw-r--r-- | testsuite/daemon.test | 2 | ||||
-rw-r--r-- | testsuite/devices.test | 4 | ||||
-rw-r--r-- | testsuite/itemize.test | 4 | ||||
-rw-r--r-- | testsuite/xattrs.test | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/testsuite/acls-default.test b/testsuite/acls-default.test index a0a482ce..d8fba7fe 100644 --- a/testsuite/acls-default.test +++ b/testsuite/acls-default.test @@ -7,7 +7,7 @@ . $suitedir/rsync.fns -$RSYNC --version | grep "[, ] ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support" +$RSYNC -VV | grep '"ACLs": true' >/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/acls.test b/testsuite/acls.test index 23449018..693da667 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 -VV | grep '"ACLs": true' >/dev/null || test_skipped "Rsync is configured without ACL support" makepath "$fromdir/foo" echo something >"$fromdir/file1" diff --git a/testsuite/atimes.test b/testsuite/atimes.test index 3bdb1d46..4d46eb05 100644 --- a/testsuite/atimes.test +++ b/testsuite/atimes.test @@ -4,7 +4,7 @@ . "$suitedir/rsync.fns" -$RSYNC --version | grep "[, ] atimes" >/dev/null || test_skipped "Rsync is configured without atimes support" +$RSYNC -VV | grep '"atimes": true' >/dev/null || test_skipped "Rsync is configured without atimes support" mkdir "$fromdir" diff --git a/testsuite/chown.test b/testsuite/chown.test index 5dadb836..b53413e1 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 -VV | grep '"xattrs": true' >/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/crtimes.test b/testsuite/crtimes.test index 07d9269b..456f0a5f 100644 --- a/testsuite/crtimes.test +++ b/testsuite/crtimes.test @@ -4,7 +4,7 @@ . "$suitedir/rsync.fns" -$RSYNC --version | grep "[, ] crtimes" >/dev/null || test_skipped "Rsync is configured without crtimes support" +$RSYNC -VV | grep '"crtimes": true' >/dev/null || test_skipped "Rsync is configured without crtimes support" # Setting an older time via touch sets the create time to the mtime. # Setting it to a newer time affects just the mtime. diff --git a/testsuite/daemon.test b/testsuite/daemon.test index 80d2baf6..60aa334b 100644 --- a/testsuite/daemon.test +++ b/testsuite/daemon.test @@ -81,7 +81,7 @@ drwxr-xr-x DIR ####/##/## ##:##:## foo EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" -if $RSYNC --version | grep "[, ] atimes" >/dev/null; then +if $RSYNC -VV | grep '"atimes": true' >/dev/null; then checkdiff "$RSYNC -rU localhost::test-from/f*" \ "sed -e '$FILE_REPL' -e '$DIR_REPL' -e '$LS_REPL'" <<EOT drwxr-xr-x DIR ####/##/## ##:##:## foo diff --git a/testsuite/devices.test b/testsuite/devices.test index cd9cf3a2..ad5f936b 100644 --- a/testsuite/devices.test +++ b/testsuite/devices.test @@ -13,7 +13,7 @@ case $0 in *fake*) - $RSYNC --version | grep "[, ] xattrs" >/dev/null || test_skipped "Rsync needs xattrs for fake device tests" + $RSYNC -VV | grep '"xattrs": true' >/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 @@ -94,7 +94,7 @@ esac # TODO: Need to test whether hardlinks are possible on this OS/filesystem -$RSYNC --version | grep "[, ] hardlink-special" >/dev/null && CAN_HLINK_SPECIAL=yes || CAN_HLINK_SPECIAL=no +$RSYNC -VV | grep '"hardlink_specials": true' >/dev/null && CAN_HLINK_SPECIAL=yes || CAN_HLINK_SPECIAL=no mkdir "$fromdir" mkdir "$todir" diff --git a/testsuite/itemize.test b/testsuite/itemize.test index 7c29f696..c1c57c59 100644 --- a/testsuite/itemize.test +++ b/testsuite/itemize.test @@ -25,7 +25,7 @@ ln "$fromdir/foo/config1" "$fromdir/foo/extra" rm -f "$to2dir" # Check if rsync is set to hard-link symlinks. -if $RSYNC --version | grep "[, ] hardlink-symlinks" >/dev/null; then +if $RSYNC -VV | grep '"hardlink_symlinks": true' >/dev/null; then L=hL sym_dots="$allspace" L_sym_dots=".L$allspace" @@ -45,7 +45,7 @@ case "$RSYNC" in T=.T ;; *) - if $RSYNC --version | grep "[, ] symtimes" >/dev/null; then + if $RSYNC -VV | grep '"symtimes": true' >/dev/null; then T=.t else T=.T diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test index 455abef1..d94d5f95 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 -VV | grep '"xattrs": true' >/dev/null || test_skipped "Rsync is configured without xattr support" case "$HOST_OS" in darwin*) |