diff options
| -rw-r--r-- | testsuite/hands.test | 18 | ||||
| -rw-r--r-- | testsuite/ssh-basic.test | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/testsuite/hands.test b/testsuite/hands.test index 4430c2a1..0b5d4289 100644 --- a/testsuite/hands.test +++ b/testsuite/hands.test @@ -11,19 +11,19 @@ hands_setup # Main script starts here -runtest "basic operation" 'checkit "$RSYNC -av ${FROM}/ ${TO}" ${FROM}/ ${TO}' +runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' -ln ${FROM}/filelist ${FROM}/dir -runtest "hard links" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}' +ln "$fromdir/filelist" "$fromdir/dir" +runtest "hard links" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' -rm ${TO}/text -runtest "one file" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}' +rm "$todir/text" +runtest "one file" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' -echo "extra line" >> ${TO}/text -runtest "extra data" 'checkit "$RSYNC -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}' +echo "extra line" >> "$todir/text" +runtest "extra data" 'checkit "$RSYNC -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' -cp ${FROM}/text ${TO}/ThisShouldGo -runtest " --delete" 'checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}' +cp "$fromdir/text" "$todir/ThisShouldGo" +runtest " --delete" 'checkit "$RSYNC --delete -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"' # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/ssh-basic.test b/testsuite/ssh-basic.test index 5fadcf32..f6228fea 100644 --- a/testsuite/ssh-basic.test +++ b/testsuite/ssh-basic.test @@ -24,11 +24,11 @@ if ! [ "`ssh -o'BatchMode yes' localhost echo yes`" = "yes" ]; then fi # Added by Steve Bonds Feb 2 2003 -# Without this, there are no files in the ${FROM} directory, so rsync has +# Without this, there are no files in the $fromdir directory, so rsync has # nothing to do. hands_setup -runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}' +runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"' # Added by Steve Bonds Feb 2 2003 # I assumed that "F1" was intended to hold a single file for testing if @@ -36,8 +36,8 @@ runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FRO # it was unset so the "mv" tried to move a parent directory into a # subdirectory of itself. There is probably a better way of pulling out # a sample file to rename. -F1=`ls ${TO} | head -5 | tail -1` +F1=`ls "$todir" | head -5 | tail -1` -mv ${TO}/${F1} ${TO}/ThisShouldGo +mv "$todir/$F1" "$todir/ThisShouldGo" -runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}' +runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"' |