diff options
Diffstat (limited to 'contrib/cvs/src/sanity.sh')
| -rwxr-xr-x | contrib/cvs/src/sanity.sh | 1318 |
1 files changed, 562 insertions, 756 deletions
diff --git a/contrib/cvs/src/sanity.sh b/contrib/cvs/src/sanity.sh index 22c1a9830ad1e..935b78c79768a 100755 --- a/contrib/cvs/src/sanity.sh +++ b/contrib/cvs/src/sanity.sh @@ -42,6 +42,8 @@ unset CVSREAD # 'sort' and tabs and spaces (LC_COLLATE). # Messages from getopt (LC_MESSAGES) (in the future, CVS itself might # also alter its messages based on LC_MESSAGES). +LANG=C +export LANG LC_ALL=C export LC_ALL @@ -104,7 +106,10 @@ shift # "debugger" #set -x -echo 'This test should produce no other output than this line, and a final "OK".' +echo 'This test should produce no other output than this message, and a final "OK".' +echo '(Note that the test can take an hour or more to run and periodically stops' +echo 'for as long as one minute. Do not assume there is a problem just because' +echo 'nothing seems to happen for a long time.)' # Regexp to match what CVS will call itself in output that it prints. # FIXME: we don't properly quote this--if the name contains . we'll @@ -172,6 +177,7 @@ fi # if we wanted to get baroque we could start making symlinks # to ensure the two are different. tmp=`(cd /tmp; /bin/pwd || pwd) 2>/dev/null` +: ${TMPDIR=$tmp} # Now: # 1) Set TESTDIR if it's not set already @@ -264,14 +270,6 @@ for pass in false :; do ;; esac done -username=`$ID -un` -if $EXPR "${username}" : "${username}" >/dev/null; then - : good, it works -else - echo "Test suite does not work correctly when run by a username" >&2 - echo "containing regular expression meta-characters." >&2 - exit 1 -fi # Cause NextStep 3.3 users to lose in a more graceful fashion. if $EXPR 'abc @@ -397,6 +395,16 @@ else QUESTION='\?' fi +# Now test the username to make sure it contains only valid characters +username=`$ID -un` +if $EXPR "${username}" : "${username}" >/dev/null; then + : good, it works +else + echo "Test suite does not work correctly when run by a username" >&2 + echo "containing regular expression meta-characters." >&2 + exit 1 +fi + # now make sure that tr works on NULs if $EXPR `echo "123" | ${TR} '2' '\0'` : "123" >/dev/null 2>&1; then TR=`find_tool tr` @@ -664,11 +672,12 @@ if test x"$*" = x; then # Basic/miscellaneous functionality tests="version basica basicb basicc basic1 deep basic2" tests="${tests} files spacefiles commit-readonly" + tests="${tests} commit-add-missing" # Branching, tagging, removing, adding, multiple directories tests="${tests} rdiff diff death death2 rm-update-message rmadd rmadd2" tests="${tests} dirs dirs2 branches branches2 tagc tagf" tests="${tests} rcslib multibranch import importb importc" - tests="${tests} import-after-initial" + tests="${tests} update-p import-after-initial" tests="${tests} join join2 join3 join-readonly-conflict" tests="${tests} join-admin join-admin-2" tests="${tests} new newb conflicts conflicts2 conflicts3" @@ -707,7 +716,7 @@ if test x"$*" = x; then # Multiple root directories and low-level protocol tests. tests="${tests} multiroot multiroot2 multiroot3 multiroot4" tests="${tests} rmroot reposmv pserver server server2 client" - tests="${tests} fork" + tests="${tests} fork commit-d" else tests="$*" fi @@ -1927,16 +1936,7 @@ done" dotest_fail basicb-1a "test -d CVS" '' - # In 1b and 1c, the first string matches if we're using absolute - # paths, while the second matches if RELATIVE_REPOS is defined - # (we're using relative paths). - -: dotest basicb-1b "cat CVS/Repository" \ -"${CVSROOT_DIRNAME}/\." \ -"\." - dotest basicb-1c "cat first-dir/CVS/Repository" \ -"${CVSROOT_DIRNAME}/first-dir" \ -"first-dir" + dotest basicb-1c "cat first-dir/CVS/Repository" "first-dir" cd first-dir # Note that the name Emptydir is chosen to test that CVS just @@ -2041,16 +2041,7 @@ U newdir/first-dir/sdir2/sfile2' dotest_fail basicb-9a "test -d CVS" '' - # In 9b through 9f, the first string matches if we're using - # absolute paths, while the second matches if RELATIVE_REPOS - # is defined (we're using relative paths). - -: dotest basicb-9b "cat CVS/Repository" \ -"${CVSROOT_DIRNAME}/\." \ -"\." - dotest basicb-9c "cat newdir/CVS/Repository" \ -"${CVSROOT_DIRNAME}/\." \ -"\." + dotest basicb-9c "cat newdir/CVS/Repository" "\." dotest basicb-9d "cat newdir/first-dir/CVS/Repository" \ "${CVSROOT_DIRNAME}/first-dir" \ "first-dir" @@ -3283,18 +3274,20 @@ diff -c first-dir/dir1/dir2/file7:1\.1 first-dir/dir1/dir2/file7:removed - file7 --- 0 ----" # now export by rtagged-by-head and rtagged-by-tag and compare. - dotest basic2-25 "${testcvs} export -r rtagged-by-head first-dir" \ -"${PROG} [a-z]*: Updating first-dir -U first-dir/file14 -U first-dir/file6 -${PROG} [a-z]*: Updating first-dir/dir1 -U first-dir/dir1/file14 -U first-dir/dir1/file6 -${PROG} [a-z]*: Updating first-dir/dir1/dir2 -U first-dir/dir1/dir2/file14 -U first-dir/dir1/dir2/file6" + dotest basic2-25 "${testcvs} export -r rtagged-by-head -d 1dir first-dir" \ +"${PROG} [a-z]*: Updating 1dir +U 1dir/file14 +U 1dir/file6 +${PROG} [a-z]*: Updating 1dir/dir1 +U 1dir/dir1/file14 +U 1dir/dir1/file6 +${PROG} [a-z]*: Updating 1dir/dir1/dir2 +U 1dir/dir1/dir2/file14 +U 1dir/dir1/dir2/file6" + dotest_fail basic2-25a "test -d 1dir/CVS" + dotest_fail basic2-25b "test -d 1dir/dir1/CVS" + dotest_fail basic2-25c "test -d 1dir/dir1/dir2/CVS" - mv first-dir 1dir dotest basic2-26 "${testcvs} export -r rtagged-by-tag first-dir" \ "${PROG} [a-z]*: Updating first-dir U first-dir/file14 @@ -3305,11 +3298,15 @@ U first-dir/dir1/file6 ${PROG} [a-z]*: Updating first-dir/dir1/dir2 U first-dir/dir1/dir2/file14 U first-dir/dir1/dir2/file6" + dotest_fail basic2-26a "test -d first-dir/CVS" + dotest_fail basic2-26b "test -d first-dir/dir1/CVS" + dotest_fail basic2-26c "test -d first-dir/dir1/dir2/CVS" dotest basic2-27 "directory_cmp 1dir first-dir" rm -r 1dir first-dir # checkout by revision vs export by rtagged-by-revision and compare. + mkdir export-dir dotest basic2-28 "${testcvs} export -rrtagged-by-revision -d export-dir first-dir" \ "${PROG} [a-z]*: Updating export-dir U export-dir/file14 @@ -3323,6 +3320,9 @@ ${PROG} [a-z]*: Updating export-dir/dir1/dir2 U export-dir/dir1/dir2/file14 U export-dir/dir1/dir2/file6 U export-dir/dir1/dir2/file7" + dotest_fail basic2-28a "test -d export-dir/CVS" + dotest_fail basic2-28b "test -d export-dir/dir1/CVS" + dotest_fail basic2-28c "test -d export-dir/dir1/dir2/CVS" dotest basic2-29 "${testcvs} co -r1.1 first-dir" \ "${PROG} [a-z]*: Updating first-dir @@ -5711,45 +5711,177 @@ File: file5 Status: Up-to-date dotest tagc-2 "${testcvs} add first-dir" \ "Directory ${CVSROOT_DIRNAME}/first-dir added to the repository" cd first-dir - touch file1 - dotest tagc-3 "${testcvs} add file1" \ + touch file1 file2 + dotest tagc-3 "${testcvs} add file1 file2" \ "${PROG} [a-z]*: scheduling file .file1. for addition -${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" +${PROG} [a-z]*: scheduling file .file2. for addition +${PROG} [a-z]*: use .${PROG} commit. to add these files permanently" dotest tagc-4 "${testcvs} -q ci -m add" \ "RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v done Checking in file1; ${CVSROOT_DIRNAME}/first-dir/file1,v <-- file1 initial revision: 1\.1 +done +RCS file: ${CVSROOT_DIRNAME}/first-dir/file2,v +done +Checking in file2; +${CVSROOT_DIRNAME}/first-dir/file2,v <-- file2 +initial revision: 1\.1 done" - dotest tagc-5 "${testcvs} -q tag -c tag1" "T file1" - touch file1 - dotest tagc-6 "${testcvs} -q tag -c tag2" "T file1" + dotest tagc-5 "${testcvs} -q tag -c tag1" \ +"T file1 +T file2" + touch file1 file2 + dotest tagc-6 "${testcvs} -q tag -c tag2" \ +"T file1 +T file2" # Avoid timestamp granularity bugs (FIXME: CVS should be # doing the sleep, right?). sleep 1 echo myedit >>file1 + dotest tagc-6a "${testcvs} rm -f file2" \ +"${PROG} [a-z]*: scheduling .file2. for removal +${PROG} [a-z]*: use .${PROG} commit. to remove this file permanently" + touch file3 + dotest tagc-6b "${testcvs} add file3" \ +"${PROG} [a-z]*: scheduling file .file3. for addition +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" dotest_fail tagc-7 "${testcvs} -q tag -c tag3" \ "${PROG} [a-z]*: file1 is locally modified +${PROG} [a-z]*: file2 is locally modified +${PROG} [a-z]*: file3 is locally modified ${PROG} \[[a-z]* aborted\]: correct the above errors first!" cd ../.. mkdir 2 cd 2 - dotest tagc-8 "${testcvs} -q co first-dir" "U first-dir/file1" + dotest tagc-8 "${testcvs} -q co first-dir" \ +"U first-dir/file1 +U first-dir/file2" cd ../1/first-dir dotest tagc-9 "${testcvs} -q ci -m modify" \ "Checking in file1; ${CVSROOT_DIRNAME}/first-dir/file1,v <-- file1 new revision: 1\.2; previous revision: 1\.1 +done +Removing file2; +${CVSROOT_DIRNAME}/first-dir/file2,v <-- file2 +new revision: delete; previous revision: 1\.1 +done +RCS file: ${CVSROOT_DIRNAME}/first-dir/file3,v +done +Checking in file3; +${CVSROOT_DIRNAME}/first-dir/file3,v <-- file3 +initial revision: 1\.1 done" cd ../../2/first-dir - dotest tagc-10 "${testcvs} -q tag -c tag4" "T file1" + dotest tagc-10 "${testcvs} -q tag -c tag4" \ +"${PROG} [a-z]*: file2 is no longer in the repository +T file1 +T file2" cd ../.. rm -r 1 2 rm -rf ${CVSROOT_DIRNAME}/first-dir ;; + update-p) + # Make sure `cvs update -p -rT FILE' works from a branch when + # FILE is already on the trunk and is being added to that branch. + + mkdir 1; cd 1 + module=x + + echo > unused-file + + # Create the module. + dotest update-p-1 \ + "$testcvs -Q import -m. $module X Y" '' + + file=F + # Check it out and tag it. + dotest update-p-2 "$testcvs -Q co $module" '' + cd $module + dotest update-p-3 "$testcvs -Q tag -b B" '' + echo v1 > $file + dotest update-p-4 "$testcvs -Q add $file" '' + dotest update-p-5 "$testcvs -Q ci -m. $file" \ +"RCS file: ${TESTDIR}/cvsroot/$module/$file,v +done +Checking in $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +initial revision: 1\.1 +done" + dotest update-p-6 "$testcvs -Q tag T $file" '' + dotest update-p-7 "$testcvs -Q update -rB" '' + + # This merge effectively adds file F on branch B. + dotest update-p-8 "$testcvs -Q update -jT" '' + + # Before the fix that prompted the addition of this test, + # the following command would fail with this diagnostic: + # cvs update: conflict: F created independently by second party + dotest update-p-9 "$testcvs update -p -rT $file" \ +"=================================================================== +Checking out $file +RCS: ${TESTDIR}/cvsroot/$module/$file,v +VERS: 1\.1 +\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* +v1" + + # Repeat the above, but with $file removed. + # This exercises a slightly different code path. + rm $file + # Before the fix that prompted the addition of this test, + # the following command would fail with this diagnostic: + # cvs update: warning: new-born F has disappeared + dotest update-p-10 "$testcvs update -p -rT $file" \ +"=================================================================== +Checking out $file +RCS: ${TESTDIR}/cvsroot/$module/$file,v +VERS: 1\.1 +\*\*\*\*\*\*\*\*\*\*\*\*\*\*\* +v1" + + # Exercise yet another code path: + # the one that involves reviving a `dead' file. + # And a little more, for good measure... + touch new + dotest update-p-a1 "$testcvs -Q add new" '' + dotest update-p-a2 "$testcvs -Q update -p new" '' + dotest update-p-a3 "$testcvs -Q rm -f new" '' + + # Both an update -A, *and* the following update are required + # to return to the state of being on the trunk with a $file + # that we can then remove. + dotest update-p-undead-0 "$testcvs update -A" \ +"${PROG} [a-z]*: Updating \. +${PROG} [a-z]*: warning: new-born $file has disappeared" + dotest update-p-undead-1 "$testcvs update" \ +"${PROG} [a-z]*: Updating \. +U $file" + dotest update-p-undead-2 "$testcvs -Q update -p -rT $file" v1 + dotest update-p-undead-3 "$testcvs -Q rm -f $file" '' + dotest update-p-undead-4 "$testcvs -Q update -p -rT $file" v1 + dotest update-p-undead-5 "$testcvs -Q ci -m. $file" \ +"Removing $file; +${TESTDIR}/cvsroot/$module/$file,v <-- $file +new revision: delete; previous revision: 1\.1 +done" + dotest update-p-undead-6 "$testcvs -Q update -p -rT $file" v1 + echo v2 > $file + dotest update-p-undead-7 "$testcvs -Q update -p -rT $file" v1 + dotest update-p-undead-8 "$testcvs add $file" \ +"${PROG} [a-z]*: re-adding file $file (in place of dead revision 1\.2) +${PROG} [a-z]*: use .${PROG} commit. to add this file permanently" + + dotest update-p-undead-9 "$testcvs -Q update -p -rT $file" v1 + + cd ../.. + rm -rf 1 + rm -rf ${CVSROOT_DIRNAME}/$module + ;; + tagf) # More tagging tests, including using tag -F -B to convert a # branch tag to a regular tag and recovering thereof. @@ -6213,7 +6345,7 @@ Checking in file3; ${CVSROOT_DIRNAME}/first-dir/Attic/file3,v <-- file3 new revision: 1\.1\.2\.1; previous revision: 1\.1 done" - rm ${CVSROOT_DIRNAME}/first-dir/file2,v + rm -f ${CVSROOT_DIRNAME}/first-dir/file2,v dotest rcslib-symlink-3f "ln -s Attic/file3,v ${CVSROOT_DIRNAME}/first-dir/file2,v" dotest rcslib-symlink-3g "${testcvs} update file2" "U file2" @@ -6224,7 +6356,7 @@ done" ${CVSROOT_DIRNAME}/first-dir/Attic/file3,v <-- file3 new revision: delete; previous revision: 1\.1\.2\.1 done" - rm ${CVSROOT_DIRNAME}/first-dir/file2,v + rm -f ${CVSROOT_DIRNAME}/first-dir/file2,v rm -f ${CVSROOT_DIRNAME}/first-dir/Attic/file3,v dotest rcslib-symlink-3h "ln -s file1,v ${CVSROOT_DIRNAME}/first-dir/file2,v" @@ -6694,16 +6826,8 @@ add mkdir adir/sub1/ssdir mkdir bdir/subdir touch adir/sub1/file1 adir/sub2/file2 adir/sub1/ssdir/ssfile - # If I'm correctly reading the Single Unix Specification, - # version 2, then "touch -t 197107040343" or "touch -t 203412251801" - # should work. But GNU touch seems to have other ideas. - # I sort of wonder if this is lossage by the standards bodies, - # I'm not sure. - # Note that some versions of touch when used without -t don't handle - # y2k and/or set the seconds reliably. - # We should probably find a different way of doing this. - touch 0704034371 bdir/subdir/file1 - touch 1225180134 cdir/cfile + touch -t 197107040343 bdir/subdir/file1 + touch -t 203412251801 cdir/cfile dotest_sort importc-1 \ "${testcvs} import -d -m import-it first-dir vendor release" \ " @@ -9676,7 +9800,7 @@ ${PROG} [a-z]*: Rebuilding administrative file database" dotest modules5-8 "${testcvs} co realmodule" \ "U realmodule/a ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/checkout\.sh. .realmodule.. -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: realmodule" else dotest modules5-8 "${testcvs} co realmodule" \ @@ -9689,11 +9813,11 @@ args: realmodule" dotest_fail modules5-10 "test -f realmodule/b" "" if $remote; then dotest modules5-11 "${testcvs} -q co realmodule" \ -"checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +"checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: realmodule" dotest modules5-12 "${testcvs} -q update" \ "${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/update\.sh. .${CVSROOT_DIRNAME}/first-dir/subdir.. -update script invoked in ${tmp}/cvs-serv[0-9a-z]*/realmodule +update script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*/realmodule args: ${CVSROOT_DIRNAME}/first-dir/subdir" echo "change" >>realmodule/a dotest modules5-13 "${testcvs} -q ci -m." \ @@ -9702,7 +9826,7 @@ ${CVSROOT_DIRNAME}/first-dir/subdir/a,v <-- a new revision: 1\.2; previous revision: 1\.1 done ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/checkin\.sh. .${CVSROOT_DIRNAME}/first-dir/subdir.. -checkin script invoked in ${tmp}/cvs-serv[0-9a-z]*/realmodule +checkin script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*/realmodule args: ${CVSROOT_DIRNAME}/first-dir/subdir" else dotest modules5-11 "${testcvs} -q co realmodule" \ @@ -9728,12 +9852,12 @@ Are you sure you want to release (and delete) directory .realmodule.: " dotest modules5-15 "${testcvs} -q rtag -Dnow MYTAG realmodule" \ "tag script invoked in ${TESTDIR}/1 args: realmodule MYTAG" \ -"tag script invoked in ${tmp}/cvs-serv[0-9a-z]* +"tag script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: realmodule MYTAG" if $remote; then dotest modules5-16 "${testcvs} -q export -r MYTAG realmodule" \ "U realmodule/a -export script invoked in ${tmp}/cvs-serv[0-9a-z]* +export script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: realmodule" else dotest modules5-16 "${testcvs} -q export -r MYTAG realmodule" \ @@ -9753,7 +9877,7 @@ args: realmodule" dotest modules5-18 "${testcvs} co dirmodule/a" \ "U dirmodule/a ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/checkout\.sh. .dirmodule.. -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: dirmodule" else dotest modules5-18 "${testcvs} co dirmodule/a" \ @@ -9778,7 +9902,7 @@ Are you sure you want to release (and delete) directory .dirmodule.: " dotest modules5-22 "${testcvs} co dirmodule/nonexist" \ "${PROG} [a-z]*: warning: new-born dirmodule/nonexist has disappeared ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/checkout\.sh. .dirmodule.. -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: dirmodule" else dotest modules5-22 "${testcvs} co dirmodule/nonexist" \ @@ -9799,7 +9923,7 @@ args: dirmodule" dotest modules5-24 "${testcvs} -q co namedmodule" \ "U nameddir/a U nameddir/b -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: nameddir" else dotest modules5-24 "${testcvs} -q co namedmodule" \ @@ -9817,9 +9941,9 @@ args: nameddir" dotest modules5-26 "${testcvs} -q co namedmodule" \ "M nameddir/a ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/update\.sh. .${CVSROOT_DIRNAME}/first-dir/subdir.. -update script invoked in ${tmp}/cvs-serv[0-9a-z]*/nameddir +update script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*/nameddir args: ${CVSROOT_DIRNAME}/first-dir/subdir -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: nameddir" else dotest modules5-26 "${testcvs} -q co namedmodule" \ @@ -9836,9 +9960,9 @@ args: nameddir" dotest modules5-27 "${testcvs} -q co namedmodule" \ "U nameddir/a ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/update\.sh. .${CVSROOT_DIRNAME}/first-dir/subdir.. -update script invoked in ${tmp}/cvs-serv[0-9a-z]*/nameddir +update script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*/nameddir args: ${CVSROOT_DIRNAME}/first-dir/subdir -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: nameddir" else dotest modules5-27 "${testcvs} -q co namedmodule" \ @@ -9860,7 +9984,7 @@ Are you sure you want to release (and delete) directory .nameddir.: " dotest modules5-29 "${testcvs} co -d mydir realmodule" \ "U mydir/a ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/checkout\.sh. .mydir.. -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: mydir" else dotest modules5-29 "${testcvs} co -d mydir realmodule" \ @@ -9873,11 +9997,11 @@ args: mydir" dotest_fail modules5-31 "test -d realmodule || test -f mydir/b" "" if $remote; then dotest modules5-32 "${testcvs} -q co -d mydir realmodule" \ -"checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +"checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: mydir" dotest modules5-33 "${testcvs} -q update" \ "${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/update\.sh. .${CVSROOT_DIRNAME}/first-dir/subdir.. -update script invoked in ${tmp}/cvs-serv[0-9a-z]*/mydir +update script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*/mydir args: ${CVSROOT_DIRNAME}/first-dir/subdir" echo "change" >>mydir/a dotest modules5-34 "${testcvs} -q ci -m." \ @@ -9886,7 +10010,7 @@ ${CVSROOT_DIRNAME}/first-dir/subdir/a,v <-- a new revision: 1\.3; previous revision: 1\.2 done ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/checkin\.sh. .${CVSROOT_DIRNAME}/first-dir/subdir.. -checkin script invoked in ${tmp}/cvs-serv[0-9a-z]*/mydir +checkin script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*/mydir args: ${CVSROOT_DIRNAME}/first-dir/subdir" else dotest modules5-32 "${testcvs} -q co -d mydir realmodule" \ @@ -9911,11 +10035,11 @@ args: ${CVSROOT_DIRNAME}/first-dir/subdir" Are you sure you want to release (and delete) directory .mydir.: " if $remote; then dotest modules5-36 "${testcvs} -q rtag -Dnow MYTAG2 realmodule" \ -"tag script invoked in ${tmp}/cvs-serv[0-9a-z]* +"tag script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: realmodule MYTAG2" dotest modules5-37 "${testcvs} -q export -r MYTAG2 -d mydir realmodule" \ "U mydir/a -export script invoked in ${tmp}/cvs-serv[0-9a-z]* +export script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: mydir" else dotest modules5-36 "${testcvs} -q rtag -Dnow MYTAG2 realmodule" \ @@ -9933,7 +10057,7 @@ args: mydir" dotest modules5-38 "${testcvs} co -d mydir dirmodule/a" \ "U mydir/a ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/checkout\.sh. .mydir.. -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: mydir" else dotest modules5-38 "${testcvs} co -d mydir dirmodule/a" \ @@ -9958,7 +10082,7 @@ Are you sure you want to release (and delete) directory .mydir.: " dotest modules5-42 "${testcvs} co -d mydir dirmodule/nonexist" \ "${PROG} [a-z]*: warning: new-born mydir/nonexist has disappeared ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/checkout\.sh. .mydir.. -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: mydir" else dotest modules5-42 "${testcvs} co -d mydir dirmodule/nonexist" \ @@ -9977,7 +10101,7 @@ args: mydir" dotest modules5-44 "${testcvs} -q co -d mydir namedmodule" \ "U mydir/a U mydir/b -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: mydir" else dotest modules5-44 "${testcvs} -q co -d mydir namedmodule" \ @@ -9996,9 +10120,9 @@ args: mydir" dotest modules5-47 "${testcvs} -q co -d mydir namedmodule" \ "M mydir/a ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/update\.sh. .${CVSROOT_DIRNAME}/first-dir/subdir.. -update script invoked in ${tmp}/cvs-serv[0-9a-z]*/mydir +update script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*/mydir args: ${CVSROOT_DIRNAME}/first-dir/subdir -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: mydir" else dotest modules5-47 "${testcvs} -q co -d mydir namedmodule" \ @@ -10015,9 +10139,9 @@ args: mydir" dotest modules5-48 "${testcvs} -q co -d mydir namedmodule" \ "U mydir/a ${PROG} [a-z]*: Executing ..${CVSROOT_DIRNAME}/update\.sh. .${CVSROOT_DIRNAME}/first-dir/subdir.. -update script invoked in ${tmp}/cvs-serv[0-9a-z]*/mydir +update script invoked in ${TMPDIR}/cvs-serv[0-9a-z]*/mydir args: ${CVSROOT_DIRNAME}/first-dir/subdir -checkout script invoked in ${tmp}/cvs-serv[0-9a-z]* +checkout script invoked in ${TMPDIR}/cvs-serv[0-9a-z]* args: mydir" else dotest modules5-48 "${testcvs} -q co -d mydir namedmodule" \ @@ -10174,29 +10298,13 @@ ${PROG} [a-z]*: Rebuilding administrative file database" dotest cvsadm-1 "${testcvs} co CVSROOT/modules" \ "U CVSROOT/modules" - # Try to determine whether RELATIVE_REPOS is defined - # so that we can make the following a lot less - # verbose. - - echo "${CVSROOT_DIRNAME}/." > ${TESTDIR}/dotest.abs - echo "." > ${TESTDIR}/dotest.rel - if cmp ${TESTDIR}/dotest.abs CVS/Repository >/dev/null 2>&1; then - AREP="${CVSROOT_DIRNAME}/" - elif cmp ${TESTDIR}/dotest.rel CVS/Repository >/dev/null 2>&1; then - AREP="" - else - fail "Cannot figure out if RELATIVE_REPOS is defined." - fi - # Test CVS/Root once. Since there is only one part of # the code which writes CVS/Root files (Create_Admin), # there is no point in testing this every time. dotest cvsadm-1a "cat CVS/Root" ${REP} - dotest cvsadm-1b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1b "cat CVS/Repository" "\." dotest cvsadm-1c "cat CVSROOT/CVS/Root" ${REP} - dotest cvsadm-1d "cat CVSROOT/CVS/Repository" \ -"${AREP}CVSROOT" + dotest cvsadm-1d "cat CVSROOT/CVS/Repository" "CVSROOT" # All of the defined module names begin with a number. # All of the top-level directory names begin with "dir". # All of the subdirectory names begin with "sub". @@ -10301,59 +10409,45 @@ done" dotest cvsadm-3 "${testcvs} co 1mod" \ "${PROG} [a-z]*: Updating 1mod U 1mod/file1" - dotest cvsadm-3b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-3d "cat 1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-3b "cat CVS/Repository" "\." + dotest cvsadm-3d "cat 1mod/CVS/Repository" "mod1" rm -rf CVS 1mod dotest cvsadm-4 "${testcvs} co 2mod" \ "${PROG} [a-z]*: Updating 2mod U 2mod/file2" - dotest cvsadm-4b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-4d "cat 2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-4b "cat CVS/Repository" "\." + dotest cvsadm-4d "cat 2mod/CVS/Repository" "mod2/sub2" rm -rf CVS 2mod dotest cvsadm-5 "${testcvs} co 1d1mod" \ "${PROG} [a-z]*: Updating dir1d1 U dir1d1/file1" - dotest cvsadm-5b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-5d "cat dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-5b "cat CVS/Repository" "\." + dotest cvsadm-5d "cat dir1d1/CVS/Repository" "mod1" rm -rf CVS dir1d1 dotest cvsadm-6 "${testcvs} co 1d2mod" \ "${PROG} [a-z]*: Updating dir1d2 U dir1d2/file2" - dotest cvsadm-6b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-6d "cat dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-6b "cat CVS/Repository" "\." + dotest cvsadm-6d "cat dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir1d2 dotest cvsadm-7 "${testcvs} co 2d1mod" \ "${PROG} [a-z]*: Updating dir2d1/sub2d1 U dir2d1/sub2d1/file1" - dotest cvsadm-7b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-7d "cat dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-7f "cat dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-7b "cat CVS/Repository" "\." + dotest cvsadm-7d "cat dir2d1/CVS/Repository" "\." + dotest cvsadm-7f "cat dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir2d1 dotest cvsadm-8 "${testcvs} co 2d2mod" \ "${PROG} [a-z]*: Updating dir2d2/sub2d2 U dir2d2/sub2d2/file2" - dotest cvsadm-8b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-8d "cat dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-8f "cat dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-8b "cat CVS/Repository" "\." + dotest cvsadm-8d "cat dir2d2/CVS/Repository" "mod2" + dotest cvsadm-8f "cat dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir2d2 ################################################## @@ -10369,14 +10463,11 @@ U 1mod/file1 ${PROG} [a-z]*: Updating 1mod-2 U 1mod-2/file1-2" # the usual for the top level - dotest cvsadm-9b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-9b "cat CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-9d "cat 1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-9d "cat 1mod/CVS/Repository" "mod1" # the usual for 1mod copy - dotest cvsadm-9f "cat 1mod-2/CVS/Repository" \ -"${AREP}mod1-2" + dotest cvsadm-9f "cat 1mod-2/CVS/Repository" "mod1-2" rm -rf CVS 1mod 1mod-2 # 1mod 2mod redmod bluemod @@ -10386,14 +10477,11 @@ U 1mod/file1 ${PROG} [a-z]*: Updating 2mod U 2mod/file2" # the usual for the top level - dotest cvsadm-10b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-10b "cat CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-10d "cat 1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-10d "cat 1mod/CVS/Repository" "mod1" # the usual for 2dmod - dotest cvsadm-10f "cat 2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-10f "cat 2mod/CVS/Repository" "mod2/sub2" rm -rf CVS 1mod 2mod dotest cvsadm-11 "${testcvs} co 1mod 1d1mod" \ @@ -10402,14 +10490,11 @@ U 1mod/file1 ${PROG} [a-z]*: Updating dir1d1 U dir1d1/file1" # the usual for the top level - dotest cvsadm-11b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-11b "cat CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-11d "cat 1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-11d "cat 1mod/CVS/Repository" "mod1" # the usual for 1d1mod - dotest cvsadm-11f "cat dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-11f "cat dir1d1/CVS/Repository" "mod1" rm -rf CVS 1mod dir1d1 dotest cvsadm-12 "${testcvs} co 1mod 1d2mod" \ @@ -10418,14 +10503,11 @@ U 1mod/file1 ${PROG} [a-z]*: Updating dir1d2 U dir1d2/file2" # the usual for the top level - dotest cvsadm-12b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-12b "cat CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-12d "cat 1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-12d "cat 1mod/CVS/Repository" "mod1" # the usual for 1d2mod - dotest cvsadm-12f "cat dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-12f "cat dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS 1mod dir1d2 dotest cvsadm-13 "${testcvs} co 1mod 2d1mod" \ @@ -10434,16 +10516,12 @@ U 1mod/file1 ${PROG} [a-z]*: Updating dir2d1/sub2d1 U dir2d1/sub2d1/file1" # the usual for the top level - dotest cvsadm-13b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-13b "cat CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-13d "cat 1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-13d "cat 1mod/CVS/Repository" "mod1" # the usual for 2d1mod - dotest cvsadm-13f "cat dir2d1/CVS/Repository" \ -"${AREP}." - dotest cvsadm-13h "cat dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-13f "cat dir2d1/CVS/Repository" "\." + dotest cvsadm-13h "cat dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS 1mod dir2d1 dotest cvsadm-14 "${testcvs} co 1mod 2d2mod" \ @@ -10452,16 +10530,12 @@ U 1mod/file1 ${PROG} [a-z]*: Updating dir2d2/sub2d2 U dir2d2/sub2d2/file2" # the usual for the top level - dotest cvsadm-14b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-14b "cat CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-14d "cat 1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-14d "cat 1mod/CVS/Repository" "mod1" # the usual for 2d2mod - dotest cvsadm-14f "cat dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-14h "cat dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-14f "cat dir2d2/CVS/Repository" "mod2" + dotest cvsadm-14h "cat dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS 1mod dir2d2 @@ -10473,14 +10547,11 @@ U 2mod/file2 ${PROG} [a-z]*: Updating 2mod-2 U 2mod-2/file2-2" # the usual for the top level - dotest cvsadm-15b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-15b "cat CVS/Repository" "\." # the usual for 2mod - dotest cvsadm-15d "cat 2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-15d "cat 2mod/CVS/Repository" "mod2/sub2" # the usual for 2mod copy - dotest cvsadm-15f "cat 2mod-2/CVS/Repository" \ -"${AREP}mod2-2/sub2-2" + dotest cvsadm-15f "cat 2mod-2/CVS/Repository" "mod2-2/sub2-2" rm -rf CVS 2mod 2mod-2 @@ -10490,14 +10561,11 @@ U 2mod/file2 ${PROG} [a-z]*: Updating dir1d1 U dir1d1/file1" # the usual for the top level - dotest cvsadm-16b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-16b "cat CVS/Repository" "\." # the usual for 2mod - dotest cvsadm-16d "cat 2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-16d "cat 2mod/CVS/Repository" "mod2/sub2" # the usual for 1d1mod - dotest cvsadm-16f "cat dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-16f "cat dir1d1/CVS/Repository" "mod1" rm -rf CVS 2mod dir1d1 dotest cvsadm-17 "${testcvs} co 2mod 1d2mod" \ @@ -10506,14 +10574,11 @@ U 2mod/file2 ${PROG} [a-z]*: Updating dir1d2 U dir1d2/file2" # the usual for the top level - dotest cvsadm-17b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-17b "cat CVS/Repository" "\." # the usual for 2mod - dotest cvsadm-17d "cat 2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-17d "cat 2mod/CVS/Repository" "mod2/sub2" # the usual for 1d2mod - dotest cvsadm-17f "cat dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-17f "cat dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS 2mod dir1d2 dotest cvsadm-18 "${testcvs} co 2mod 2d1mod" \ @@ -10522,16 +10587,12 @@ U 2mod/file2 ${PROG} [a-z]*: Updating dir2d1/sub2d1 U dir2d1/sub2d1/file1" # the usual for the top level - dotest cvsadm-18b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-18b "cat CVS/Repository" "\." # the usual for 2mod - dotest cvsadm-18d "cat 2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-18d "cat 2mod/CVS/Repository" "mod2/sub2" # the usual for 2d1mod - dotest cvsadm-18f "cat dir2d1/CVS/Repository" \ -"${AREP}." - dotest cvsadm-18h "cat dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-18f "cat dir2d1/CVS/Repository" "\." + dotest cvsadm-18h "cat dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS 2mod dir2d1 dotest cvsadm-19 "${testcvs} co 2mod 2d2mod" \ @@ -10540,16 +10601,12 @@ U 2mod/file2 ${PROG} [a-z]*: Updating dir2d2/sub2d2 U dir2d2/sub2d2/file2" # the usual for the top level - dotest cvsadm-19b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-19b "cat CVS/Repository" "\." # the usual for 2mod - dotest cvsadm-19d "cat 2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-19d "cat 2mod/CVS/Repository" "mod2/sub2" # the usual for 2d2mod - dotest cvsadm-19f "cat dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-19h "cat dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-19f "cat dir2d2/CVS/Repository" "mod2" + dotest cvsadm-19h "cat dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS 2mod dir2d2 @@ -10561,14 +10618,11 @@ U dir1d1/file1 ${PROG} [a-z]*: Updating dir1d1-2 U dir1d1-2/file1-2" # the usual for the top level - dotest cvsadm-20b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-20b "cat CVS/Repository" "\." # the usual for 1d1mod - dotest cvsadm-20d "cat dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-20d "cat dir1d1/CVS/Repository" "mod1" # the usual for 1d1mod copy - dotest cvsadm-20f "cat dir1d1-2/CVS/Repository" \ -"${AREP}mod1-2" + dotest cvsadm-20f "cat dir1d1-2/CVS/Repository" "mod1-2" rm -rf CVS dir1d1 dir1d1-2 dotest cvsadm-21 "${testcvs} co 1d1mod 1d2mod" \ @@ -10577,14 +10631,11 @@ U dir1d1/file1 ${PROG} [a-z]*: Updating dir1d2 U dir1d2/file2" # the usual for the top level - dotest cvsadm-21b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-21b "cat CVS/Repository" "\." # the usual for 1d1mod - dotest cvsadm-21d "cat dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-21d "cat dir1d1/CVS/Repository" "mod1" # the usual for 1d2mod - dotest cvsadm-21f "cat dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-21f "cat dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir1d1 dir1d2 dotest cvsadm-22 "${testcvs} co 1d1mod 2d1mod" \ @@ -10593,16 +10644,12 @@ U dir1d1/file1 ${PROG} [a-z]*: Updating dir2d1/sub2d1 U dir2d1/sub2d1/file1" # the usual for the top level - dotest cvsadm-22b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-22b "cat CVS/Repository" "\." # the usual for 1d1mod - dotest cvsadm-22d "cat dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-22d "cat dir1d1/CVS/Repository" "mod1" # the usual for 2d1mod - dotest cvsadm-22f "cat dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-22h "cat dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-22f "cat dir2d1/CVS/Repository" "\." + dotest cvsadm-22h "cat dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir1d1 dir2d1 dotest cvsadm-23 "${testcvs} co 1d1mod 2d2mod" \ @@ -10611,16 +10658,12 @@ U dir1d1/file1 ${PROG} [a-z]*: Updating dir2d2/sub2d2 U dir2d2/sub2d2/file2" # the usual for the top level - dotest cvsadm-23b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-23b "cat CVS/Repository" "\." # the usual for 1d1mod - dotest cvsadm-23d "cat dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-23d "cat dir1d1/CVS/Repository" "mod1" # the usual for 2d2mod - dotest cvsadm-23f "cat dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-23h "cat dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-23f "cat dir2d2/CVS/Repository" "mod2" + dotest cvsadm-23h "cat dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir1d1 dir2d2 @@ -10632,14 +10675,11 @@ U dir1d2/file2 ${PROG} [a-z]*: Updating dir1d2-2 U dir1d2-2/file2-2" # the usual for the top level - dotest cvsadm-24b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-24b "cat CVS/Repository" "\." # the usual for 1d2mod - dotest cvsadm-24d "cat dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-24d "cat dir1d2/CVS/Repository" "mod2/sub2" # the usual for 1d2mod copy - dotest cvsadm-24f "cat dir1d2-2/CVS/Repository" \ -"${AREP}mod2-2/sub2-2" + dotest cvsadm-24f "cat dir1d2-2/CVS/Repository" "mod2-2/sub2-2" rm -rf CVS dir1d2 dir1d2-2 dotest cvsadm-25 "${testcvs} co 1d2mod 2d1mod" \ @@ -10648,16 +10688,12 @@ U dir1d2/file2 ${PROG} [a-z]*: Updating dir2d1/sub2d1 U dir2d1/sub2d1/file1" # the usual for the top level - dotest cvsadm-25b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-25b "cat CVS/Repository" "\." # the usual for 1d2mod - dotest cvsadm-25d "cat dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-25d "cat dir1d2/CVS/Repository" "mod2/sub2" # the usual for 2d1mod - dotest cvsadm-25f "cat dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-25h "cat dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-25f "cat dir2d1/CVS/Repository" "\." + dotest cvsadm-25h "cat dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir1d2 dir2d1 dotest cvsadm-26 "${testcvs} co 1d2mod 2d2mod" \ @@ -10666,16 +10702,12 @@ U dir1d2/file2 ${PROG} [a-z]*: Updating dir2d2/sub2d2 U dir2d2/sub2d2/file2" # the usual for the top level - dotest cvsadm-26b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-26b "cat CVS/Repository" "\." # the usual for 1d2mod - dotest cvsadm-26d "cat dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-26d "cat dir1d2/CVS/Repository" "mod2/sub2" # the usual for 2d2mod - dotest cvsadm-26f "cat dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-26h "cat dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-26f "cat dir2d2/CVS/Repository" "mod2" + dotest cvsadm-26h "cat dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir1d2 dir2d2 @@ -10687,18 +10719,13 @@ U dir2d1/sub2d1/file1 ${PROG} [a-z]*: Updating dir2d1-2/sub2d1-2 U dir2d1-2/sub2d1-2/file1-2" # the usual for the top level - dotest cvsadm-27b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-27b "cat CVS/Repository" "\." # the usual for 2d1mod - dotest cvsadm-27d "cat dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-27f "cat dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-27d "cat dir2d1/CVS/Repository" "\." + dotest cvsadm-27f "cat dir2d1/sub2d1/CVS/Repository" "mod1" # the usual for 2d1mod - dotest cvsadm-27h "cat dir2d1-2/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-27j "cat dir2d1-2/sub2d1-2/CVS/Repository" \ -"${AREP}mod1-2" + dotest cvsadm-27h "cat dir2d1-2/CVS/Repository" "\." + dotest cvsadm-27j "cat dir2d1-2/sub2d1-2/CVS/Repository" "mod1-2" rm -rf CVS dir2d1 dir2d1-2 dotest cvsadm-28 "${testcvs} co 2d1mod 2d2mod" \ @@ -10707,18 +10734,13 @@ U dir2d1/sub2d1/file1 ${PROG} [a-z]*: Updating dir2d2/sub2d2 U dir2d2/sub2d2/file2" # the usual for the top level - dotest cvsadm-28b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-28b "cat CVS/Repository" "\." # the usual for 2d1mod - dotest cvsadm-28d "cat dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-28f "cat dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-28d "cat dir2d1/CVS/Repository" "\." + dotest cvsadm-28f "cat dir2d1/sub2d1/CVS/Repository" "mod1" # the usual for 2d2mod - dotest cvsadm-28h "cat dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-28j "cat dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-28h "cat dir2d2/CVS/Repository" "mod2" + dotest cvsadm-28j "cat dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir2d1 dir2d2 @@ -10730,18 +10752,14 @@ U dir2d2/sub2d2/file2 ${PROG} [a-z]*: Updating dir2d2-2/sub2d2-2 U dir2d2-2/sub2d2-2/file2-2" # the usual for the top level - dotest cvsadm-29b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-29b "cat CVS/Repository" "\." # the usual for 2d2mod - dotest cvsadm-29d "cat dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-29f "cat dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-29d "cat dir2d2/CVS/Repository" "mod2" + dotest cvsadm-29f "cat dir2d2/sub2d2/CVS/Repository" "mod2/sub2" # the usual for 2d2mod - dotest cvsadm-29h "cat dir2d2-2/CVS/Repository" \ -"${AREP}mod2-2" + dotest cvsadm-29h "cat dir2d2-2/CVS/Repository" "mod2-2" dotest cvsadm-29j "cat dir2d2-2/sub2d2-2/CVS/Repository" \ -"${AREP}mod2-2/sub2-2" +"mod2-2/sub2-2" rm -rf CVS dir2d2 dir2d2-2 ################################################## @@ -10752,55 +10770,43 @@ U dir2d2-2/sub2d2-2/file2-2" dotest cvsadm-1d3 "${testcvs} co -d dir 1mod" \ "${PROG} [a-z]*: Updating dir U dir/file1" - dotest cvsadm-1d3b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d3d "cat dir/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d3b "cat CVS/Repository" "\." + dotest cvsadm-1d3d "cat dir/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d4 "${testcvs} co -d dir 2mod" \ "${PROG} [a-z]*: Updating dir U dir/file2" - dotest cvsadm-1d4b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d4d "cat dir/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d4b "cat CVS/Repository" "\." + dotest cvsadm-1d4d "cat dir/CVS/Repository" "mod2/sub2" rm -rf CVS dir dotest cvsadm-1d5 "${testcvs} co -d dir 1d1mod" \ "${PROG} [a-z]*: Updating dir U dir/file1" - dotest cvsadm-1d5b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d5d "cat dir/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d5b "cat CVS/Repository" "\." + dotest cvsadm-1d5d "cat dir/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d6 "${testcvs} co -d dir 1d2mod" \ "${PROG} [a-z]*: Updating dir U dir/file2" - dotest cvsadm-1d6b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d6d "cat dir/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d6b "cat CVS/Repository" "\." + dotest cvsadm-1d6d "cat dir/CVS/Repository" "mod2/sub2" rm -rf CVS dir dotest cvsadm-1d7 "${testcvs} co -d dir 2d1mod" \ "${PROG} [a-z]*: Updating dir U dir/file1" - dotest cvsadm-1d7b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d7d "cat dir/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d7b "cat CVS/Repository" "\." + dotest cvsadm-1d7d "cat dir/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d8 "${testcvs} co -d dir 2d2mod" \ "${PROG} [a-z]*: Updating dir U dir/file2" - dotest cvsadm-1d8b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d8d "cat dir/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d8b "cat CVS/Repository" "\." + dotest cvsadm-1d8d "cat dir/CVS/Repository" "mod2/sub2" rm -rf CVS dir ################################################## @@ -10815,17 +10821,13 @@ U dir/1mod/file1 ${PROG} [a-z]*: Updating dir/1mod-2 U dir/1mod-2/file1-2" # the usual for the top level - dotest cvsadm-1d9b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d9b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d9d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d9d "cat dir/CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-1d9f "cat dir/1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d9f "cat dir/1mod/CVS/Repository" "mod1" # the usual for 1mod copy - dotest cvsadm-1d9h "cat dir/1mod-2/CVS/Repository" \ -"${AREP}mod1-2" + dotest cvsadm-1d9h "cat dir/1mod-2/CVS/Repository" "mod1-2" rm -rf CVS dir # 1mod 2mod redmod bluemod @@ -10834,17 +10836,13 @@ U dir/1mod-2/file1-2" U dir/1mod/file1 ${PROG} [a-z]*: Updating dir/2mod U dir/2mod/file2" - dotest cvsadm-1d10b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d10b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d10d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d10d "cat dir/CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-1d10f "cat dir/1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d10f "cat dir/1mod/CVS/Repository" "mod1" # the usual for 2dmod - dotest cvsadm-1d10h "cat dir/2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d10h "cat dir/2mod/CVS/Repository" "mod2/sub2" rm -rf CVS dir dotest cvsadm-1d11 "${testcvs} co -d dir 1mod 1d1mod" \ @@ -10852,17 +10850,13 @@ U dir/2mod/file2" U dir/1mod/file1 ${PROG} [a-z]*: Updating dir/dir1d1 U dir/dir1d1/file1" - dotest cvsadm-1d11b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d11b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d11d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d11d "cat dir/CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-1d11f "cat dir/1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d11f "cat dir/1mod/CVS/Repository" "mod1" # the usual for 1d1mod - dotest cvsadm-1d11h "cat dir/dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d11h "cat dir/dir1d1/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d12 "${testcvs} co -d dir 1mod 1d2mod" \ @@ -10870,17 +10864,13 @@ U dir/dir1d1/file1" U dir/1mod/file1 ${PROG} [a-z]*: Updating dir/dir1d2 U dir/dir1d2/file2" - dotest cvsadm-1d12b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d12b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d12d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d12d "cat dir/CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-1d12f "cat dir/1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d12f "cat dir/1mod/CVS/Repository" "mod1" # the usual for 1d2mod - dotest cvsadm-1d12h "cat dir/dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d12h "cat dir/dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir dotest cvsadm-1d13 "${testcvs} co -d dir 1mod 2d1mod" \ @@ -10888,19 +10878,14 @@ U dir/dir1d2/file2" U dir/1mod/file1 ${PROG} [a-z]*: Updating dir/dir2d1/sub2d1 U dir/dir2d1/sub2d1/file1" - dotest cvsadm-1d13b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d13b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d13d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d13d "cat dir/CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-1d13f "cat dir/1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d13f "cat dir/1mod/CVS/Repository" "mod1" # the usual for 2d1mod - dotest cvsadm-1d13h "cat dir/dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d13j "cat dir/dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d13h "cat dir/dir2d1/CVS/Repository" "\." + dotest cvsadm-1d13j "cat dir/dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d14 "${testcvs} co -d dir 1mod 2d2mod" \ @@ -10908,19 +10893,14 @@ U dir/dir2d1/sub2d1/file1" U dir/1mod/file1 ${PROG} [a-z]*: Updating dir/dir2d2/sub2d2 U dir/dir2d2/sub2d2/file2" - dotest cvsadm-1d14b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d14b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d14d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d14d "cat dir/CVS/Repository" "\." # the usual for 1mod - dotest cvsadm-1d14f "cat dir/1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d14f "cat dir/1mod/CVS/Repository" "mod1" # the usual for 2d2mod - dotest cvsadm-1d14h "cat dir/dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-1d14j "cat dir/dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d14h "cat dir/dir2d2/CVS/Repository" "mod2" + dotest cvsadm-1d14j "cat dir/dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir @@ -10931,17 +10911,13 @@ U dir/dir2d2/sub2d2/file2" U dir/2mod/file2 ${PROG} [a-z]*: Updating dir/2mod-2 U dir/2mod-2/file2-2" - dotest cvsadm-1d15b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d15b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d15d "cat dir/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-1d15d "cat dir/CVS/Repository" "mod2" # the usual for 2mod - dotest cvsadm-1d15f "cat dir/2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d15f "cat dir/2mod/CVS/Repository" "mod2/sub2" # the usual for 2mod copy - dotest cvsadm-1d15h "cat dir/2mod-2/CVS/Repository" \ -"${AREP}mod2-2/sub2-2" + dotest cvsadm-1d15h "cat dir/2mod-2/CVS/Repository" "mod2-2/sub2-2" rm -rf CVS dir dotest cvsadm-1d16 "${testcvs} co -d dir 2mod 1d1mod" \ @@ -10949,17 +10925,13 @@ U dir/2mod-2/file2-2" U dir/2mod/file2 ${PROG} [a-z]*: Updating dir/dir1d1 U dir/dir1d1/file1" - dotest cvsadm-1d16b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d16b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d16d "cat dir/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-1d16d "cat dir/CVS/Repository" "mod2" # the usual for 2mod - dotest cvsadm-1d16f "cat dir/2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d16f "cat dir/2mod/CVS/Repository" "mod2/sub2" # the usual for 1d1mod - dotest cvsadm-1d16h "cat dir/dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d16h "cat dir/dir1d1/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d17 "${testcvs} co -d dir 2mod 1d2mod" \ @@ -10967,17 +10939,13 @@ U dir/dir1d1/file1" U dir/2mod/file2 ${PROG} [a-z]*: Updating dir/dir1d2 U dir/dir1d2/file2" - dotest cvsadm-1d17b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d17b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d17d "cat dir/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-1d17d "cat dir/CVS/Repository" "mod2" # the usual for 2mod - dotest cvsadm-1d17f "cat dir/2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d17f "cat dir/2mod/CVS/Repository" "mod2/sub2" # the usual for 1d2mod - dotest cvsadm-1d17h "cat dir/dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d17h "cat dir/dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir dotest cvsadm-1d18 "${testcvs} co -d dir 2mod 2d1mod" \ @@ -10985,19 +10953,14 @@ U dir/dir1d2/file2" U dir/2mod/file2 ${PROG} [a-z]*: Updating dir/dir2d1/sub2d1 U dir/dir2d1/sub2d1/file1" - dotest cvsadm-1d18b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d18b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d18d "cat dir/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-1d18d "cat dir/CVS/Repository" "mod2" # the usual for 2mod - dotest cvsadm-1d18f "cat dir/2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d18f "cat dir/2mod/CVS/Repository" "mod2/sub2" # the usual for 2d1mod - dotest cvsadm-1d18h "cat dir/dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d18j "cat dir/dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d18h "cat dir/dir2d1/CVS/Repository" "\." + dotest cvsadm-1d18j "cat dir/dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d19 "${testcvs} co -d dir 2mod 2d2mod" \ @@ -11005,19 +10968,14 @@ U dir/dir2d1/sub2d1/file1" U dir/2mod/file2 ${PROG} [a-z]*: Updating dir/dir2d2/sub2d2 U dir/dir2d2/sub2d2/file2" - dotest cvsadm-1d19b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d19b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d19d "cat dir/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-1d19d "cat dir/CVS/Repository" "mod2" # the usual for 2mod - dotest cvsadm-1d19f "cat dir/2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d19f "cat dir/2mod/CVS/Repository" "mod2/sub2" # the usual for 2d2mod - dotest cvsadm-1d19h "cat dir/dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-1d19j "cat dir/dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d19h "cat dir/dir2d2/CVS/Repository" "mod2" + dotest cvsadm-1d19j "cat dir/dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir @@ -11028,17 +10986,13 @@ U dir/dir2d2/sub2d2/file2" U dir/dir1d1/file1 ${PROG} [a-z]*: Updating dir/dir1d1-2 U dir/dir1d1-2/file1-2" - dotest cvsadm-1d20b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d20b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d20d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d20d "cat dir/CVS/Repository" "\." # the usual for 1d1mod - dotest cvsadm-1d20f "cat dir/dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d20f "cat dir/dir1d1/CVS/Repository" "mod1" # the usual for 1d1mod copy - dotest cvsadm-1d20h "cat dir/dir1d1-2/CVS/Repository" \ -"${AREP}mod1-2" + dotest cvsadm-1d20h "cat dir/dir1d1-2/CVS/Repository" "mod1-2" rm -rf CVS dir dotest cvsadm-1d21 "${testcvs} co -d dir 1d1mod 1d2mod" \ @@ -11046,17 +11000,13 @@ U dir/dir1d1-2/file1-2" U dir/dir1d1/file1 ${PROG} [a-z]*: Updating dir/dir1d2 U dir/dir1d2/file2" - dotest cvsadm-1d21b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d21b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d21d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d21d "cat dir/CVS/Repository" "\." # the usual for 1d1mod - dotest cvsadm-1d21f "cat dir/dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d21f "cat dir/dir1d1/CVS/Repository" "mod1" # the usual for 1d2mod - dotest cvsadm-1d21h "cat dir/dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d21h "cat dir/dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir dotest cvsadm-1d22 "${testcvs} co -d dir 1d1mod 2d1mod" \ @@ -11064,19 +11014,14 @@ U dir/dir1d2/file2" U dir/dir1d1/file1 ${PROG} [a-z]*: Updating dir/dir2d1/sub2d1 U dir/dir2d1/sub2d1/file1" - dotest cvsadm-1d22b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d22b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d22d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d22d "cat dir/CVS/Repository" "\." # the usual for 1d1mod - dotest cvsadm-1d22f "cat dir/dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d22f "cat dir/dir1d1/CVS/Repository" "mod1" # the usual for 2d1mod - dotest cvsadm-1d22h "cat dir/dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d22j "cat dir/dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d22h "cat dir/dir2d1/CVS/Repository" "\." + dotest cvsadm-1d22j "cat dir/dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d23 "${testcvs} co -d dir 1d1mod 2d2mod" \ @@ -11084,19 +11029,14 @@ U dir/dir2d1/sub2d1/file1" U dir/dir1d1/file1 ${PROG} [a-z]*: Updating dir/dir2d2/sub2d2 U dir/dir2d2/sub2d2/file2" - dotest cvsadm-1d23b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d23b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d23d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d23d "cat dir/CVS/Repository" "\." # the usual for 1d1mod - dotest cvsadm-1d23f "cat dir/dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d23f "cat dir/dir1d1/CVS/Repository" "mod1" # the usual for 2d2mod - dotest cvsadm-1d23h "cat dir/dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-1d23j "cat dir/dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d23h "cat dir/dir2d2/CVS/Repository" "mod2" + dotest cvsadm-1d23j "cat dir/dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir @@ -11107,17 +11047,13 @@ U dir/dir2d2/sub2d2/file2" U dir/dir1d2/file2 ${PROG} [a-z]*: Updating dir/dir1d2-2 U dir/dir1d2-2/file2-2" - dotest cvsadm-1d24b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d24b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d24d "cat dir/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-1d24d "cat dir/CVS/Repository" "mod2" # the usual for 1d2mod - dotest cvsadm-1d24f "cat dir/dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d24f "cat dir/dir1d2/CVS/Repository" "mod2/sub2" # the usual for 1d2mod copy - dotest cvsadm-1d24h "cat dir/dir1d2-2/CVS/Repository" \ -"${AREP}mod2-2/sub2-2" + dotest cvsadm-1d24h "cat dir/dir1d2-2/CVS/Repository" "mod2-2/sub2-2" rm -rf CVS dir dotest cvsadm-1d25 "${testcvs} co -d dir 1d2mod 2d1mod" \ @@ -11125,19 +11061,14 @@ U dir/dir1d2-2/file2-2" U dir/dir1d2/file2 ${PROG} [a-z]*: Updating dir/dir2d1/sub2d1 U dir/dir2d1/sub2d1/file1" - dotest cvsadm-1d25b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d25b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d25d "cat dir/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-1d25d "cat dir/CVS/Repository" "mod2" # the usual for 1d2mod - dotest cvsadm-1d25f "cat dir/dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d25f "cat dir/dir1d2/CVS/Repository" "mod2/sub2" # the usual for 2d1mod - dotest cvsadm-1d25h "cat dir/dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d25j "cat dir/dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d25h "cat dir/dir2d1/CVS/Repository" "\." + dotest cvsadm-1d25j "cat dir/dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-1d26 "${testcvs} co -d dir 1d2mod 2d2mod" \ @@ -11145,19 +11076,14 @@ U dir/dir2d1/sub2d1/file1" U dir/dir1d2/file2 ${PROG} [a-z]*: Updating dir/dir2d2/sub2d2 U dir/dir2d2/sub2d2/file2" - dotest cvsadm-1d26b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d26b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d26d "cat dir/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-1d26d "cat dir/CVS/Repository" "mod2" # the usual for 1d2mod - dotest cvsadm-1d26f "cat dir/dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d26f "cat dir/dir1d2/CVS/Repository" "mod2/sub2" # the usual for 2d2mod - dotest cvsadm-1d26h "cat dir/dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-1d26j "cat dir/dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d26h "cat dir/dir2d2/CVS/Repository" "mod2" + dotest cvsadm-1d26j "cat dir/dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir @@ -11168,21 +11094,16 @@ U dir/dir2d2/sub2d2/file2" U dir/dir2d1/sub2d1/file1 ${PROG} [a-z]*: Updating dir/dir2d1-2/sub2d1-2 U dir/dir2d1-2/sub2d1-2/file1-2" - dotest cvsadm-1d27b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d27b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d27d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" + dotest cvsadm-1d27d "cat dir/CVS/Repository" "CVSROOT/Emptydir" # the usual for 2d1mod - dotest cvsadm-1d27f "cat dir/dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d27h "cat dir/dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d27f "cat dir/dir2d1/CVS/Repository" "\." + dotest cvsadm-1d27h "cat dir/dir2d1/sub2d1/CVS/Repository" "mod1" # the usual for 2d1mod - dotest cvsadm-1d27j "cat dir/dir2d1-2/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d27j "cat dir/dir2d1-2/CVS/Repository" "\." dotest cvsadm-1d27l "cat dir/dir2d1-2/sub2d1-2/CVS/Repository" \ -"${AREP}mod1-2" +"mod1-2" rm -rf CVS dir dotest cvsadm-1d28 "${testcvs} co -d dir 2d1mod 2d2mod" \ @@ -11190,21 +11111,15 @@ U dir/dir2d1-2/sub2d1-2/file1-2" U dir/dir2d1/sub2d1/file1 ${PROG} [a-z]*: Updating dir/dir2d2/sub2d2 U dir/dir2d2/sub2d2/file2" - dotest cvsadm-1d28b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d28b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d28d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" + dotest cvsadm-1d28d "cat dir/CVS/Repository" "CVSROOT/Emptydir" # the usual for 2d1mod - dotest cvsadm-1d28f "cat dir/dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-1d28h "cat dir/dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-1d28f "cat dir/dir2d1/CVS/Repository" "\." + dotest cvsadm-1d28h "cat dir/dir2d1/sub2d1/CVS/Repository" "mod1" # the usual for 2d2mod - dotest cvsadm-1d28j "cat dir/dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-1d28l "cat dir/dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d28j "cat dir/dir2d2/CVS/Repository" "mod2" + dotest cvsadm-1d28l "cat dir/dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir @@ -11215,21 +11130,16 @@ U dir/dir2d2/sub2d2/file2" U dir/dir2d2/sub2d2/file2 ${PROG} [a-z]*: Updating dir/dir2d2-2/sub2d2-2 U dir/dir2d2-2/sub2d2-2/file2-2" - dotest cvsadm-1d29b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d29b "cat CVS/Repository" "\." # the usual for the dir level - dotest cvsadm-1d29d "cat dir/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-1d29d "cat dir/CVS/Repository" "\." # the usual for 2d2mod - dotest cvsadm-1d29f "cat dir/dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-1d29h "cat dir/dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-1d29f "cat dir/dir2d2/CVS/Repository" "mod2" + dotest cvsadm-1d29h "cat dir/dir2d2/sub2d2/CVS/Repository" "mod2/sub2" # the usual for 2d2mod - dotest cvsadm-1d29j "cat dir/dir2d2-2/CVS/Repository" \ -"${AREP}mod2-2" + dotest cvsadm-1d29j "cat dir/dir2d2-2/CVS/Repository" "mod2-2" dotest cvsadm-1d29l "cat dir/dir2d2-2/sub2d2-2/CVS/Repository" \ -"${AREP}mod2-2/sub2-2" +"mod2-2/sub2-2" rm -rf CVS dir ################################################## @@ -11248,61 +11158,49 @@ U dir/dir2d2-2/sub2d2-2/file2-2" dotest cvsadm-2d3 "${testcvs} co -d dir/dir2 1mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file1" - dotest cvsadm-2d3b "cat CVS/Repository" \ -"${AREP}\." + dotest cvsadm-2d3b "cat CVS/Repository" "\." dotest_fail cvsadm-2d3d "test -f dir/CVS/Repository" "" - dotest cvsadm-2d3f "cat dir/dir2/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-2d3f "cat dir/dir2/CVS/Repository" "mod1" rm -rf CVS dir mkdir dir dotest cvsadm-2d4 "${testcvs} co -d dir/dir2 2mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file2" - dotest cvsadm-2d4b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-2d4f "cat dir/dir2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-2d4b "cat CVS/Repository" "\." + dotest cvsadm-2d4f "cat dir/dir2/CVS/Repository" "mod2/sub2" rm -rf CVS dir mkdir dir dotest cvsadm-2d5 "${testcvs} co -d dir/dir2 1d1mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file1" - dotest cvsadm-2d5b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-2d5f "cat dir/dir2/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-2d5b "cat CVS/Repository" "\." + dotest cvsadm-2d5f "cat dir/dir2/CVS/Repository" "mod1" rm -rf CVS dir mkdir dir dotest cvsadm-2d6 "${testcvs} co -d dir/dir2 1d2mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file2" - dotest cvsadm-2d6b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-2d6f "cat dir/dir2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-2d6b "cat CVS/Repository" "\." + dotest cvsadm-2d6f "cat dir/dir2/CVS/Repository" "mod2/sub2" rm -rf CVS dir mkdir dir dotest cvsadm-2d7 "${testcvs} co -d dir/dir2 2d1mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file1" - dotest cvsadm-2d7b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-2d7f "cat dir/dir2/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-2d7b "cat CVS/Repository" "\." + dotest cvsadm-2d7f "cat dir/dir2/CVS/Repository" "mod1" rm -rf CVS dir mkdir dir dotest cvsadm-2d8 "${testcvs} co -d dir/dir2 2d2mod" \ "${PROG} [a-z]*: Updating dir/dir2 U dir/dir2/file2" - dotest cvsadm-2d8b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-2d8f "cat dir/dir2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-2d8b "cat CVS/Repository" "\." + dotest cvsadm-2d8f "cat dir/dir2/CVS/Repository" "mod2/sub2" rm -rf CVS dir ################################################## @@ -11313,59 +11211,45 @@ U dir/dir2/file2" dotest cvsadm-N3 "${testcvs} co -N 1mod" \ "${PROG} [a-z]*: Updating 1mod U 1mod/file1" - dotest cvsadm-N3b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N3d "cat 1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-N3b "cat CVS/Repository" "\." + dotest cvsadm-N3d "cat 1mod/CVS/Repository" "mod1" rm -rf CVS 1mod dotest cvsadm-N4 "${testcvs} co -N 2mod" \ "${PROG} [a-z]*: Updating 2mod U 2mod/file2" - dotest cvsadm-N4b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N4d "cat 2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-N4b "cat CVS/Repository" "\." + dotest cvsadm-N4d "cat 2mod/CVS/Repository" "mod2/sub2" rm -rf CVS 2mod dotest cvsadm-N5 "${testcvs} co -N 1d1mod" \ "${PROG} [a-z]*: Updating dir1d1 U dir1d1/file1" - dotest cvsadm-N5b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N5d "cat dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-N5b "cat CVS/Repository" "\." + dotest cvsadm-N5d "cat dir1d1/CVS/Repository" "mod1" rm -rf CVS dir1d1 dotest cvsadm-N6 "${testcvs} co -N 1d2mod" \ "${PROG} [a-z]*: Updating dir1d2 U dir1d2/file2" - dotest cvsadm-N6b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N6d "cat dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-N6b "cat CVS/Repository" "\." + dotest cvsadm-N6d "cat dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir1d2 dotest cvsadm-N7 "${testcvs} co -N 2d1mod" \ "${PROG} [a-z]*: Updating dir2d1/sub2d1 U dir2d1/sub2d1/file1" - dotest cvsadm-N7b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N7d "cat dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N7f "cat dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-N7b "cat CVS/Repository" "\." + dotest cvsadm-N7d "cat dir2d1/CVS/Repository" "\." + dotest cvsadm-N7f "cat dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir2d1 dotest cvsadm-N8 "${testcvs} co -N 2d2mod" \ "${PROG} [a-z]*: Updating dir2d2/sub2d2 U dir2d2/sub2d2/file2" - dotest cvsadm-N8b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N8d "cat dir2d2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-N8f "cat dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-N8b "cat CVS/Repository" "\." + dotest cvsadm-N8d "cat dir2d2/CVS/Repository" "mod2" + dotest cvsadm-N8f "cat dir2d2/sub2d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir2d2 ## the ones in one-deep directories @@ -11373,71 +11257,52 @@ U dir2d2/sub2d2/file2" dotest cvsadm-N1d3 "${testcvs} co -N -d dir 1mod" \ "${PROG} [a-z]*: Updating dir/1mod U dir/1mod/file1" - dotest cvsadm-N1d3b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d3d "cat dir/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d3f "cat dir/1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-N1d3b "cat CVS/Repository" "\." + dotest cvsadm-N1d3d "cat dir/CVS/Repository" "\." + dotest cvsadm-N1d3f "cat dir/1mod/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-N1d4 "${testcvs} co -N -d dir 2mod" \ "${PROG} [a-z]*: Updating dir/2mod U dir/2mod/file2" - dotest cvsadm-N1d4b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d4d "cat dir/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-N1d4f "cat dir/2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-N1d4b "cat CVS/Repository" "\." + dotest cvsadm-N1d4d "cat dir/CVS/Repository" "mod2" + dotest cvsadm-N1d4f "cat dir/2mod/CVS/Repository" "mod2/sub2" rm -rf CVS dir dotest cvsadm-N1d5 "${testcvs} co -N -d dir 1d1mod" \ "${PROG} [a-z]*: Updating dir/dir1d1 U dir/dir1d1/file1" - dotest cvsadm-N1d5b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d5d "cat dir/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d5d "cat dir/dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-N1d5b "cat CVS/Repository" "\." + dotest cvsadm-N1d5d "cat dir/CVS/Repository" "\." + dotest cvsadm-N1d5d "cat dir/dir1d1/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-N1d6 "${testcvs} co -N -d dir 1d2mod" \ "${PROG} [a-z]*: Updating dir/dir1d2 U dir/dir1d2/file2" - dotest cvsadm-N1d6b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d6d "cat dir/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-N1d6f "cat dir/dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-N1d6b "cat CVS/Repository" "\." + dotest cvsadm-N1d6d "cat dir/CVS/Repository" "mod2" + dotest cvsadm-N1d6f "cat dir/dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir dotest cvsadm-N1d7 "${testcvs} co -N -d dir 2d1mod" \ "${PROG} [a-z]*: Updating dir/dir2d1/sub2d1 U dir/dir2d1/sub2d1/file1" - dotest cvsadm-N1d7b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d7d "cat dir/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" - dotest cvsadm-N1d7f "cat dir/dir2d1/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d7h "cat dir/dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-N1d7b "cat CVS/Repository" "\." + dotest cvsadm-N1d7d "cat dir/CVS/Repository" "CVSROOT/Emptydir" + dotest cvsadm-N1d7f "cat dir/dir2d1/CVS/Repository" "\." + dotest cvsadm-N1d7h "cat dir/dir2d1/sub2d1/CVS/Repository" "mod1" rm -rf CVS dir dotest cvsadm-N1d8 "${testcvs} co -N -d dir 2d2mod" \ "${PROG} [a-z]*: Updating dir/dir2d2/sub2d2 U dir/dir2d2/sub2d2/file2" - dotest cvsadm-N1d8b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d8d "cat dir/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N1d8d "cat dir/dir2d2/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-N1d8b "cat CVS/Repository" "\." + dotest cvsadm-N1d8d "cat dir/CVS/Repository" "\." + dotest cvsadm-N1d8d "cat dir/dir2d2/CVS/Repository" "mod2" dotest cvsadm-N1d8d "cat dir/dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" +"mod2/sub2" rm -rf CVS dir ## the ones in two-deep directories @@ -11446,76 +11311,58 @@ U dir/dir2d2/sub2d2/file2" dotest cvsadm-N2d3 "${testcvs} co -N -d dir/dir2 1mod" \ "${PROG} [a-z]*: Updating dir/dir2/1mod U dir/dir2/1mod/file1" - dotest cvsadm-N2d3b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d3f "cat dir/dir2/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d3h "cat dir/dir2/1mod/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-N2d3b "cat CVS/Repository" "\." + dotest cvsadm-N2d3f "cat dir/dir2/CVS/Repository" "\." + dotest cvsadm-N2d3h "cat dir/dir2/1mod/CVS/Repository" "mod1" rm -rf CVS dir mkdir dir dotest cvsadm-N2d4 "${testcvs} co -N -d dir/dir2 2mod" \ "${PROG} [a-z]*: Updating dir/dir2/2mod U dir/dir2/2mod/file2" - dotest cvsadm-N2d4b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d4f "cat dir/dir2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-N2d4h "cat dir/dir2/2mod/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-N2d4b "cat CVS/Repository" "\." + dotest cvsadm-N2d4f "cat dir/dir2/CVS/Repository" "mod2" + dotest cvsadm-N2d4h "cat dir/dir2/2mod/CVS/Repository" "mod2/sub2" rm -rf CVS dir mkdir dir dotest cvsadm-N2d5 "${testcvs} co -N -d dir/dir2 1d1mod" \ "${PROG} [a-z]*: Updating dir/dir2/dir1d1 U dir/dir2/dir1d1/file1" - dotest cvsadm-N2d5b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d5f "cat dir/dir2/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d5h "cat dir/dir2/dir1d1/CVS/Repository" \ -"${AREP}mod1" + dotest cvsadm-N2d5b "cat CVS/Repository" "\." + dotest cvsadm-N2d5f "cat dir/dir2/CVS/Repository" "\." + dotest cvsadm-N2d5h "cat dir/dir2/dir1d1/CVS/Repository" "mod1" rm -rf CVS dir mkdir dir dotest cvsadm-N2d6 "${testcvs} co -N -d dir/dir2 1d2mod" \ "${PROG} [a-z]*: Updating dir/dir2/dir1d2 U dir/dir2/dir1d2/file2" - dotest cvsadm-N2d6b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d6f "cat dir/dir2/CVS/Repository" \ -"${AREP}mod2" - dotest cvsadm-N2d6h "cat dir/dir2/dir1d2/CVS/Repository" \ -"${AREP}mod2/sub2" + dotest cvsadm-N2d6b "cat CVS/Repository" "\." + dotest cvsadm-N2d6f "cat dir/dir2/CVS/Repository" "mod2" + dotest cvsadm-N2d6h "cat dir/dir2/dir1d2/CVS/Repository" "mod2/sub2" rm -rf CVS dir mkdir dir dotest cvsadm-N2d7 "${testcvs} co -N -d dir/dir2 2d1mod" \ "${PROG} [a-z]*: Updating dir/dir2/dir2d1/sub2d1 U dir/dir2/dir2d1/sub2d1/file1" - dotest cvsadm-N2d7b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d7f "cat dir/dir2/CVS/Repository" \ -"${AREP}CVSROOT/Emptydir" - dotest cvsadm-N2d7g "cat dir/dir2/dir2d1/CVS/Repository" \ -"${AREP}\." + dotest cvsadm-N2d7b "cat CVS/Repository" "\." + dotest cvsadm-N2d7f "cat dir/dir2/CVS/Repository" "CVSROOT/Emptydir" + dotest cvsadm-N2d7g "cat dir/dir2/dir2d1/CVS/Repository" "\." dotest cvsadm-N2d7h "cat dir/dir2/dir2d1/sub2d1/CVS/Repository" \ -"${AREP}mod1" +"mod1" rm -rf CVS dir mkdir dir dotest cvsadm-N2d8 "${testcvs} co -N -d dir/dir2 2d2mod" \ "${PROG} [a-z]*: Updating dir/dir2/dir2d2/sub2d2 U dir/dir2/dir2d2/sub2d2/file2" - dotest cvsadm-N2d8b "cat CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d8f "cat dir/dir2/CVS/Repository" \ -"${AREP}\." - dotest cvsadm-N2d8h "cat dir/dir2/dir2d2/CVS/Repository" \ -"${AREP}mod2" + dotest cvsadm-N2d8b "cat CVS/Repository" "\." + dotest cvsadm-N2d8f "cat dir/dir2/CVS/Repository" "\." + dotest cvsadm-N2d8h "cat dir/dir2/dir2d2/CVS/Repository" "mod2" dotest cvsadm-N2d8j "cat dir/dir2/dir2d2/sub2d2/CVS/Repository" \ -"${AREP}mod2/sub2" +"mod2/sub2" rm -rf CVS dir fi # end of tests to be skipped for remote @@ -11718,20 +11565,7 @@ U 1/file1" U ${TESTDIR}/1/file1" fi # remote workaround - # Are we relative or absolute in our Repository file? - echo "${CVSROOT_DIRNAME}/mod1" > ${TESTDIR}/dotest.abs - echo "mod1" > ${TESTDIR}/dotest.rel - if cmp ${TESTDIR}/dotest.abs ${TESTDIR}/1/CVS/Repository >/dev/null 2>&1; then - AREP="${CVSROOT_DIRNAME}/" - elif cmp ${TESTDIR}/dotest.rel ${TESTDIR}/1/CVS/Repository >/dev/null 2>&1; then - AREP="" - else - fail "Cannot figure out if RELATIVE_REPOS is defined." - fi - rm -f ${TESTDIR}/dotest.rel ${TESTDIR}/dotest.abs - - dotest abspath-2b "cat ${TESTDIR}/1/CVS/Repository" \ -"${AREP}mod1" + dotest abspath-2b "cat ${TESTDIR}/1/CVS/Repository" "mod1" # Done. Clean up. rm -rf ${TESTDIR}/1 @@ -11771,8 +11605,7 @@ U 2/file1" "${PROG} [a-z]*: Updating ${TESTDIR}/1/2 U ${TESTDIR}/1/2/file1" fi # remote workaround - dotest abspath-3b "cat ${TESTDIR}/1/2/CVS/Repository" \ -"${AREP}mod1" + dotest abspath-3b "cat ${TESTDIR}/1/2/CVS/Repository" "mod1" # For all the same reasons that we want "1" to already # exist, we don't to mess with it to traverse it, for @@ -11812,12 +11645,9 @@ U ${TESTDIR}/1/mod1/file1 ${PROG} [a-z]*: Updating ${TESTDIR}/1/mod2 U ${TESTDIR}/1/mod2/file2" fi # end remote workaround - dotest abspath-5b "cat ${TESTDIR}/1/CVS/Repository" \ -"${AREP}." - dotest abspath-5c "cat ${TESTDIR}/1/mod1/CVS/Repository" \ -"${AREP}mod1" - dotest abspath-5d "cat ${TESTDIR}/1/mod2/CVS/Repository" \ -"${AREP}mod2" + dotest abspath-5b "cat ${TESTDIR}/1/CVS/Repository" "\." + dotest abspath-5c "cat ${TESTDIR}/1/mod1/CVS/Repository" "mod1" + dotest abspath-5d "cat ${TESTDIR}/1/mod2/CVS/Repository" "mod2" # Done. Clean up. rm -rf ${TESTDIR}/1 @@ -11842,14 +11672,10 @@ U ${TESTDIR}/1/mod1/file1 ${PROG} [a-z]*: Updating ${TESTDIR}/1/mod2 U ${TESTDIR}/1/mod2/file2" fi # end of remote workaround - dotest abspath-6b "cat ${TESTDIR}/1/CVS/Repository" \ -"${AREP}." - dotest abspath-6c "cat ${TESTDIR}/1/CVSROOT/CVS/Repository" \ -"${AREP}CVSROOT" - dotest abspath-6c "cat ${TESTDIR}/1/mod1/CVS/Repository" \ -"${AREP}mod1" - dotest abspath-6d "cat ${TESTDIR}/1/mod2/CVS/Repository" \ -"${AREP}mod2" + dotest abspath-6b "cat ${TESTDIR}/1/CVS/Repository" "\." + dotest abspath-6c "cat ${TESTDIR}/1/CVSROOT/CVS/Repository" "CVSROOT" + dotest abspath-6c "cat ${TESTDIR}/1/mod1/CVS/Repository" "mod1" + dotest abspath-6d "cat ${TESTDIR}/1/mod2/CVS/Repository" "mod2" # Done. Clean up. rm -rf ${TESTDIR}/1 @@ -17348,12 +17174,12 @@ EOF # someone feels like documenting them and things go downhill # from there). # - # Hmm, if this test is run on the 31st of the month, and 100 - # months from now is a month with only 30 days (e.g. run on - # 31 May 1999, 31 May 2001), it seems to fail. - # - # Sigh. - dotest rcs2-7 "${testcvs} -q update -p -D '100 months' file1" \ + # These tests can be expected to fail 3 times every 400 years + # starting Feb. 29, 2096 (because 8 years from that date would + # be Feb. 29, 2100, which is an invalid date -- 2100 isn't a + # leap year because it's divisible by 100 but not by 400). + + dotest rcs2-7 "${testcvs} -q update -p -D '96 months' file1" \ "head revision" dotest rcs2-8 "${testcvs} -q update -p -D '8 years' file1" \ "head revision" @@ -21825,39 +21651,22 @@ U mod2-2/file2-2" U mod1-2/file1-2" cd .. - # Try to determine whether RELATIVE_REPOS is defined - # so that we can make the following a lot less - # verbose. - - echo "${CVSROOT1_DIRNAME}/mod1-1" > dotest.abs - echo "mod1-1" > dotest.rel - if cmp dotest.abs mod1-1/CVS/Repository >/dev/null 2>&1; then - AREP1="${CVSROOT1_DIRNAME}/" - AREP2="${CVSROOT2_DIRNAME}/" - elif cmp dotest.rel mod1-1/CVS/Repository >/dev/null 2>&1; then - AREP1="" - AREP2="" - else - fail "Cannot figure out if RELATIVE_REPOS is defined." - fi - rm -f dotest.abs dotest.rel - # # Make sure that the Root and Repository files contain the # correct information. # dotest multiroot-cvsadm-1a "cat mod1-1/CVS/Root" "${CVSROOT1}" - dotest multiroot-cvsadm-1b "cat mod1-1/CVS/Repository" "${AREP1}mod1-1" + dotest multiroot-cvsadm-1b "cat mod1-1/CVS/Repository" "mod1-1" dotest multiroot-cvsadm-2a "cat mod2-1/CVS/Root" "${CVSROOT2}" - dotest multiroot-cvsadm-2b "cat mod2-1/CVS/Repository" "${AREP2}mod2-1" + dotest multiroot-cvsadm-2b "cat mod2-1/CVS/Repository" "mod2-1" dotest multiroot-cvsadm-3a "cat mod1-2/CVS/Root" "${CVSROOT1}" - dotest multiroot-cvsadm-3b "cat mod1-2/CVS/Repository" "${AREP1}mod1-2" + dotest multiroot-cvsadm-3b "cat mod1-2/CVS/Repository" "mod1-2" dotest multiroot-cvsadm-3c "cat mod1-2/mod2-2/CVS/Root" "${CVSROOT2}" - dotest multiroot-cvsadm-3d "cat mod1-2/mod2-2/CVS/Repository" "${AREP2}mod2-2" + dotest multiroot-cvsadm-3d "cat mod1-2/mod2-2/CVS/Repository" "mod2-2" dotest multiroot-cvsadm-4a "cat mod2-2/CVS/Root" "${CVSROOT2}" - dotest multiroot-cvsadm-4b "cat mod2-2/CVS/Repository" "${AREP2}mod2-2" + dotest multiroot-cvsadm-4b "cat mod2-2/CVS/Repository" "mod2-2" dotest multiroot-cvsadm-4c "cat mod2-2/mod1-2/CVS/Root" "${CVSROOT1}" - dotest multiroot-cvsadm-4d "cat mod2-2/mod1-2/CVS/Repository" "${AREP1}mod1-2" + dotest multiroot-cvsadm-4d "cat mod2-2/mod1-2/CVS/Repository" "mod1-2" # # Start testing various cvs commands. Begin with commands @@ -21869,9 +21678,7 @@ U mod1-2/file1-2" # that there's not some kind of unexpected dependency on the # choice of which CVSROOT is specified on the command line. - if test "${AREP1}" = ""; then - # RELATIVE_REPOS. - dotest multiroot-update-1a "${testcvs1} update" \ + dotest multiroot-update-1a "${testcvs1} update" \ "${PROG} [a-z]*: Updating \. ${PROG} [a-z]*: Updating mod1-1 ${PROG} [a-z]*: Updating mod1-2 @@ -21885,8 +21692,8 @@ ${PROG} [a-z]*: Updating mod2-2 ${PROG} [a-z]*: cannot open directory ${TESTDIR}/root1/mod2-2: No such file or directory ${PROG} [a-z]*: skipping directory mod2-2" - # Same deal but with -d ${CVSROOT2}. - dotest multiroot-update-1b "${testcvs2} update" \ + # Same deal but with -d ${CVSROOT2}. + dotest multiroot-update-1b "${testcvs2} update" \ "${PROG} [a-z]*: Updating \. ${PROG} [a-z]*: Updating mod1-1 ${PROG} [a-z]*: cannot open directory ${TESTDIR}/root2/mod1-1: No such file or directory @@ -21899,44 +21706,6 @@ ${PROG} [a-z]*: Updating mod2-2 ${PROG} [a-z]*: Updating mod2-2/mod1-2 ${PROG} [a-z]*: cannot open directory ${TESTDIR}/root2/mod1-2: No such file or directory ${PROG} [a-z]*: skipping directory mod2-2/mod1-2" - else - # non-RELATIVE_REPOS. - if $remote; then - # Hmm, this one is specific to non-RELATIVE_REPOS too I think. - dotest_fail multiroot-update-1ar "${testcvs1} update" \ -"protocol error: directory '${TESTDIR}/root2/mod2-2' not within root '${TESTDIR}/root1'" - else - # The basic idea is that -d overrides CVS/Root. - # With RELATIVE_REPOS, CVS could print an error when it - # tries to recurse to mod2-2, which doesn't exist in - # this repository (?) With absolute, CVS will just look at the - # CVS/Repository for the other root (and log to the wrong - # history file and that sort of thing). - dotest multiroot-update-1a "${testcvs1} update" \ -"${PROG} update: Updating \. -${PROG} [a-z]*: Updating mod1-1 -${PROG} [a-z]*: Updating mod1-2 -${PROG} [a-z]*: Updating mod1-2/mod2-2 -${PROG} [a-z]*: Updating mod2-1 -${PROG} [a-z]*: Updating mod2-2 -${PROG} [a-z]*: Updating mod2-2/mod1-2" - fi # remote - - # Same deal but with -d ${CVSROOT2}. - if $remote; then - dotest_fail multiroot-update-1b "${testcvs2} update" \ -"protocol error: directory '${TESTDIR}/root1' not within root '${TESTDIR}/root2'" - else - dotest multiroot-update-1b "${testcvs2} update" \ -"${PROG} update: Updating \. -${PROG} [a-z]*: Updating mod1-1 -${PROG} [a-z]*: Updating mod1-2 -${PROG} [a-z]*: Updating mod1-2/mod2-2 -${PROG} [a-z]*: Updating mod2-1 -${PROG} [a-z]*: Updating mod2-2 -${PROG} [a-z]*: Updating mod2-2/mod1-2" - fi # remote - fi # non-RELATIVE_REPOS # modify all files and do a diff @@ -23110,30 +22879,14 @@ ${TESTDIR}/root1/dir1/file1,v <-- file1 initial revision: 1\.1 done" - if test "`cat dir1/CVS/Repository`" = "dir1"; then - # RELATIVE_REPOS - # That this is an error is good - we are asking CVS to do - # something which doesn't make sense. - dotest_fail multiroot3-10 \ + # That this is an error is good - we are asking CVS to do + # something which doesn't make sense. + dotest_fail multiroot3-10 \ "${testcvs} -q -d ${CVSROOT1} diff dir1/file1 dir2/file2" \ "${PROG} [a-z]*: failed to create lock directory for .${TESTDIR}/root1/dir2' (${TESTDIR}/root1/dir2/#cvs.lock): No such file or directory ${PROG} [a-z]*: failed to obtain dir lock in repository .${TESTDIR}/root1/dir2' ${PROG} \[[a-z]* aborted\]: read lock failed - giving up" - else - # Not RELATIVE_REPOS. - if $remote; then - # This is good behavior - we are asking CVS to do something - # which doesn't make sense. - dotest_fail multiroot3-10 \ -"${testcvs} -q -d ${CVSROOT1} diff dir1/file1 dir2/file2" \ -"protocol error: directory '${TESTDIR}/root2/dir2' not within root '${TESTDIR}/root1'" - else - # Local isn't as picky as we'd want in terms of getting - # the wrong root. - dotest multiroot3-10 \ -"${testcvs} -q -d ${CVSROOT1} diff dir1/file1 dir2/file2" "" - fi - fi + # This one is supposed to work. dotest multiroot3-11 "${testcvs} -q diff dir1/file1 dir2/file2" "" @@ -24141,6 +23894,7 @@ Valid-responses [-a-zA-Z ]* valid-requests Argument -D Argument [34] Oct 1999 [0-9][0-9]:00:00 -0000 +Argument -- Directory \. ${CVSROOT_DIRNAME}/first-dir Entry /file1/1\.2/// @@ -24186,6 +23940,58 @@ Server: \1' fi ;; + commit-add-missing) + # Make sure that a commit fails when a `cvs add'ed file has + # been removed from the working directory. + + mkdir 1; cd 1 + module=c-a-m + echo > unused-file + dotest commit-add-missing-1 \ + "$testcvs -Q import -m. $module X Y" '' + + file=F + # Check it out and tag it. + dotest commit-add-missing-2 "$testcvs -Q co $module" '' + cd $module + dotest commit-add-missing-3 "$testcvs -Q tag -b B" '' + echo v1 > $file + dotest commit-add-missing-4 "$testcvs -Q add $file" '' + rm -f $file + dotest_fail commit-add-missing-5 "$testcvs -Q ci -m. $file" \ +"${PROG} [a-z]*: Up-to-date check failed for .$file' +${PROG} \[[a-z]* aborted\]: correct above errors first!" + + cd ../.. + rm -rf 1 + rm -rf ${CVSROOT_DIRNAME}/$module + ;; + + commit-d) + # Check that top-level commits work when CVS/Root + # is overridden by cvs -d. + + mkdir -p 1/subdir; cd 1 + touch file1 subdir/file2 + dotest commit-d-1 "$testcvs -Q import -m. c-d-c X Y" "" + dotest commit-d-2 "$testcvs -Q co c-d-c" "" + cd c-d-c + echo change >>file1; echo another change >>subdir/file2 + # Changing working root, then override with -d + echo nosuchhost:/cvs > CVS/Root + dotest commit-d-3 "$testcvs -Q -d $CVSROOT commit -m." \ +"Checking in file1; +${TESTDIR}/cvsroot/c-d-c/file1,v <-- file1 +new revision: 1.2; previous revision: 1.1 +done +Checking in subdir/file2; +${TESTDIR}/cvsroot/c-d-c/subdir/file2,v <-- file2 +new revision: 1.2; previous revision: 1.1 +done" + cd ../.. + rm -rf 1 cvsroot/c-d-c + ;; + *) echo $what is not the name of a test -- ignored ;; |