X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/beb227ddf1ea8392703430816e4d2ee6223edf83..346402ddbf731b87ec1c068f771c0838f5e22876:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index a6ddd8c2..b4bbd37d 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -19,14 +19,14 @@ tmpdir="$scratchdir" -fromdir=$tmpdir/from -todir=$tmpdir/to -chkdir=$tmpdir/chk +fromdir="$tmpdir/from" +todir="$tmpdir/to" +chkdir="$tmpdir/chk" # Berkley's nice. PATH="$PATH:/usr/ucb" -if diff -u $srcdir/testsuite/rsync.fns $srcdir/testsuite/rsync.fns >/dev/null 2>&1; then +if diff -u "$srcdir/testsuite/rsync.fns" "$srcdir/testsuite/rsync.fns" >/dev/null 2>&1; then diffopt="-u" else diffopt="-c" @@ -66,9 +66,9 @@ hands_setup() { rm -rf "$fromdir" rm -rf "$todir" - [ -d $tmpdir ] || mkdir "$tmpdir" - [ -d $fromdir ] || mkdir "$fromdir" - [ -d $todir ] || mkdir "$todir" + [ -d "$tmpdir" ] || mkdir "$tmpdir" + [ -d "$fromdir" ] || mkdir "$fromdir" + [ -d "$todir" ] || mkdir "$todir" # On some BSD systems, the umask affects the mode of created # symlinks, even though the mode apparently has no effect on how @@ -98,9 +98,17 @@ hands_setup() { mkdir "$fromdir/dir/subdir" echo some data > "$fromdir/dir/subdir/foobar.baz" mkdir "$fromdir/dir/subdir/subsubdir" - ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" + if [ -r /etc ]; then + ls -ltr /etc > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" + else + ls -ltr / > "$fromdir/dir/subdir/subsubdir/etc-ltr-list" + fi mkdir "$fromdir/dir/subdir/subsubdir2" - ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" + if [ -r /bin ]; then + ls -lt /bin > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" + else + ls -lt / > "$fromdir/dir/subdir/subsubdir2/bin-lt-list" + fi # echo testing head: # ls -lR "$srcdir" | head -10 || echo failed