# # patch "tests/t_cvspull_separate.at" # from [a58eba82b3ddce66bf9003dbbb97e0d874795bf6] # to [66e963f2f180affea97698fd9d3b779172392c94] # ======================================================================== --- tests/t_cvspull_separate.at a58eba82b3ddce66bf9003dbbb97e0d874795bf6 +++ tests/t_cvspull_separate.at 66e963f2f180affea97698fd9d3b779172392c94 @@ -23,25 +23,25 @@ # build the cvs repository -CVSROOT=`pwd`/cvs-repository -AT_CHECK(cvs -q -d $CVSROOT init) -AT_CHECK(test -e $CVSROOT) -AT_CHECK(test -e $CVSROOT/CVSROOT) -AT_CHECK(test -e $CVSROOT/CVSROOT/history) +CVSROOT="`pwd`/cvs-repository" +AT_CHECK(cvs -q -d "$CVSROOT" init) +AT_CHECK(test -e "$CVSROOT") +AT_CHECK(test -e "$CVSROOT/CVSROOT") +AT_CHECK(test -e "$CVSROOT/CVSROOT/history") # import a test project AT_CHECK(mkdir cvstemp) AT_CHECK(cp d_import cvstemp/A) -AT_CHECK([cd cvstemp ; cvs -q -d $CVSROOT import -m 'initial import' test vendor_tag initial_import], [], [ignore], [ignore]) +AT_CHECK([cd cvstemp ; cvs -q -d "$CVSROOT" import -m 'initial import' test vendor_tag initial_import], [], [ignore], [ignore]) # pull into monotone -AT_CHECK(MONOTONE --branch=testbranch cvs_pull $CVSROOT test, [0], [ignore], [ignore]) +AT_CHECK(MONOTONE --branch=testbranch cvs_pull "$CVSROOT" test, [0], [ignore], [ignore]) # change the repository in various ways -AT_CHECK([cvs -q -d $CVSROOT co test], [], [ignore], [ignore]) +AT_CHECK([cvs -q -d "$CVSROOT" co test], [], [ignore], [ignore]) AT_CHECK(cp d_add test/B) AT_CHECK([cd test;cvs -Q add B]) AT_CHECK([sleep 1;cd test;cvs -Q ci -m 'B added'])