diff options
| author | Wayne Davison <wayned@samba.org> | 2004-08-12 18:51:35 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2004-08-12 18:51:35 +0000 |
| commit | d66d07e883f12ce2be36d02fdab212f38b9bb4e0 (patch) | |
| tree | 7cabcdf37ee2a4462e3f1f7f65ebe3182adbd772 | |
| parent | b92693daba3105b797aafb25bbb07ef2df727338 (diff) | |
| download | rsync-d66d07e883f12ce2be36d02fdab212f38b9bb4e0.tar.gz | |
If system won't let us set chmod bits, fall back to testing without
them set.
| -rw-r--r-- | testsuite/chmod-temp-dir.test | 10 | ||||
| -rw-r--r-- | testsuite/chmod.test | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/testsuite/chmod-temp-dir.test b/testsuite/chmod-temp-dir.test index 9a8a9021..5fda2b12 100644 --- a/testsuite/chmod-temp-dir.test +++ b/testsuite/chmod-temp-dir.test @@ -26,13 +26,15 @@ fi chmod 440 "$fromdir/text" chmod 500 "$fromdir/dir/text" -chmod 6450 "$fromdir/dir/subdir/foobar.baz" -chmod 2670 "$fromdir/dir/subdir/subsubdir/etc-ltr-list" +e="$fromdir/dir/subdir/foobar.baz" +chmod 6450 "$e" || chmod 2450 "$e" || chmod 1450 "$e" || chmod 450 "$e" +e="$fromdir/dir/subdir/subsubdir/etc-ltr-list" +chmod 2670 "$e" || chmod 1670 "$e" || chmod 670 "$e" -# First a normal copy using --temp-dir. +# First a normal copy. runtest "normal copy" 'checkit "$RSYNC -avv --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' -# Then we update all the files using --temp-dir. +# Then we update all the files. runtest "update copy" 'checkit "$RSYNC -avvI --no-whole-file --temp-dir=\"$tmpdir2\" \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' # The script would have aborted on error, so getting here means we've won. diff --git a/testsuite/chmod.test b/testsuite/chmod.test index ce46b9f0..af5e79f5 100644 --- a/testsuite/chmod.test +++ b/testsuite/chmod.test @@ -17,8 +17,10 @@ hands_setup chmod 440 "$fromdir/text" chmod 500 "$fromdir/dir/text" -chmod 6450 "$fromdir/dir/subdir/foobar.baz" -chmod 2670 "$fromdir/dir/subdir/subsubdir/etc-ltr-list" +e="$fromdir/dir/subdir/foobar.baz" +chmod 6450 "$e" || chmod 2450 "$e" || chmod 1450 "$e" || chmod 450 "$e" +e="$fromdir/dir/subdir/subsubdir/etc-ltr-list" +chmod 2670 "$e" || chmod 1670 "$e" || chmod 670 "$e" # First a normal copy. runtest "normal copy" 'checkit "$RSYNC -avv \"$fromdir/\" \"$todir\"" "$fromdir" "$todir"' |