Module Name: src
Committed By: christos
Date: Thu Mar 22 20:49:55 UTC 2012
Modified Files:
src/external/gpl2/xcvs/dist/src: sanity.sh
Log Message:
>From Garo Taft:
- Add a -w flag which will make the sanity script sleep for a second before
and after checkouts, commits, and updates.
- Fix expected output to look for the right default action on empty log
message. It's now "abort".
- Add new requests "Checkin-prog" and "Update-prog" to expectation values.
- Add new "access"�and "group" files to CVSROOT admin database expectation
values.
- All tests pass except client-20, which hangs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/src/sanity.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl2/xcvs/dist/src/sanity.sh
diff -u src/external/gpl2/xcvs/dist/src/sanity.sh:1.2 src/external/gpl2/xcvs/dist/src/sanity.sh:1.3
--- src/external/gpl2/xcvs/dist/src/sanity.sh:1.2 Thu Mar 8 15:42:21 2012
+++ src/external/gpl2/xcvs/dist/src/sanity.sh Thu Mar 22 16:49:53 2012
@@ -22,7 +22,7 @@
usage ()
{
echo "Usage: `basename $0` --help"
- echo "Usage: `basename $0` [--eklr] [-c CONFIG-FILE] [-f FROM-TEST] \\"
+ echo "Usage: `basename $0` [--eklrw] [-c CONFIG-FILE] [-f FROM-TEST] \\"
echo " [-h HOSTNAME] [-s CVS-FOR-CVS-SERVER] CVS-TO-TEST \\"
echo " [TESTS-TO-RUN...]"
}
@@ -69,6 +69,11 @@ exit_help ()
echo "-p|--proxy test a secondary/primary CVS server (writeproxy)"
echo " configuration (implies --remote)."
echo "-r|--remote test client/server, as opposed to local, CVS"
+ echo "-w|--wait automatically sleep for a second before and after"
+ echo " checkouts, commits, and updates. Use this option"
+ echo " if you have fast cores and a slow disk. (For example,"
+ echo " you may need this flag if you see tests fail because"
+ echo " they think they have nothing to commit.)"
echo "-s CVS-FOR-CVS-SERVER"
echo "--server=CVS-FOR-CVS-SERVER"
echo " use CVS-FOR-CVS-SERVER as the path to the CVS SERVER"
@@ -132,7 +137,8 @@ proxy=false
remote=false
servercvs=false
skipfail=false
-while getopts Hc:ef:h:klnprs:-: option ; do
+waitforslowdisk=false
+while getopts Hc:ef:h:klnprs:w-: option ; do
# convert the long opts to short opts
if test x$option = x-; then
# remove any argument
@@ -198,6 +204,10 @@ while getopts Hc:ef:h:klnprs:-: option ;
option=e
OPTARG=
;;
+ w|wa|wai|wait)
+ option=w
+ OPTARG=
+ ;;
*)
option=\?
OPTARG=
@@ -250,6 +260,9 @@ while getopts Hc:ef:h:klnprs:-: option ;
servercvs="$OPTARG"
remote=:
;;
+ w)
+ waitforslowdisk=:
+ ;;
\?)
exit_usage
;;
@@ -1488,6 +1501,17 @@ run_filter ()
fi
}
+maybe_sleep_if_ci_co_or_up ()
+{
+ if $waitforslowdisk; then
+ case "$@" in
+ *" ci "*|*" ci"|*" commit "*|*" commit") sleep 1;;
+ *" co "*|*" co"|*" checkout "*|*" checkout") sleep 1;;
+ *" up "*|*" up"|*" update "*|*" update") sleep 1;;
+ esac
+ fi
+}
+
# Usage:
# dotest TESTNAME COMMAND OUTPUT [OUTPUT2]
# TESTNAME is the name used in the log to identify the test.
@@ -1503,6 +1527,7 @@ run_filter ()
# lack \|).
dotest ()
{
+ maybe_sleep_if_ci_co_or_up "$2"
rm -f $TESTDIR/dotest.ex? 2>&1
eval "$2" >$TESTDIR/dotest.tmp 2>&1
status=$?
@@ -1512,12 +1537,14 @@ dotest ()
echo "exit status was $status" >>${LOGFILE}
fail "$1"
fi
+ maybe_sleep_if_ci_co_or_up "$2"
dotest_internal "$@"
}
# Like dotest except only 2 args and result must exactly match stdin
dotest_lit ()
{
+ maybe_sleep_if_ci_co_or_up "$2"
rm -f $TESTDIR/dotest.ex? 2>&1
eval "$2" >$TESTDIR/dotest.tmp 2>&1
status=$?
@@ -1527,6 +1554,7 @@ dotest_lit ()
echo "exit status was $status" >>$LOGFILE
fail "$1"
fi
+ maybe_sleep_if_ci_co_or_up "$2"
cat >$TESTDIR/dotest.exp
if cmp $TESTDIR/dotest.exp $TESTDIR/dotest.tmp >/dev/null 2>&1; then
pass "$1"
@@ -1543,6 +1571,7 @@ dotest_lit ()
# Like dotest except exitstatus should be nonzero.
dotest_fail ()
{
+ maybe_sleep_if_ci_co_or_up "$2"
rm -f $TESTDIR/dotest.ex? 2>&1
eval "$2" >$TESTDIR/dotest.tmp 2>&1
status=$?
@@ -1552,12 +1581,14 @@ dotest_fail ()
echo "exit status was $status" >>$LOGFILE
fail "$1"
fi
+ maybe_sleep_if_ci_co_or_up "$2"
dotest_internal "$@"
}
# Like dotest except output is sorted.
dotest_sort ()
{
+ maybe_sleep_if_ci_co_or_up "$2"
rm -f $TESTDIR/dotest.ex? 2>&1
eval "$2" >$TESTDIR/dotest.tmp1 2>&1
status=$?
@@ -1568,12 +1599,14 @@ dotest_sort ()
fail "$1"
fi
$TR ' ' ' ' < $TESTDIR/dotest.tmp1 | sort > $TESTDIR/dotest.tmp
+ maybe_sleep_if_ci_co_or_up "$2"
dotest_internal "$@"
}
# Like dotest_fail except output is sorted.
dotest_fail_sort ()
{
+ maybe_sleep_if_ci_co_or_up "$2"
rm -f $TESTDIR/dotest.ex? 2>&1
eval "$2" >$TESTDIR/dotest.tmp1 2>&1
status=$?
@@ -1584,6 +1617,7 @@ dotest_fail_sort ()
fail "$1"
fi
$TR ' ' ' ' < $TESTDIR/dotest.tmp1 | sort > $TESTDIR/dotest.tmp
+ maybe_sleep_if_ci_co_or_up "$2"
dotest_internal "$@"
}
@@ -4698,11 +4732,13 @@ W [0-9-]* [0-9:]* ${PLUS}0000 ${username
dotest ls-init-1 "$testcvs -Q co -dtop ."
cd top
dotest ls-1 "$testcvs ls CVSROOT" \
-"aclconfig
+"access
+aclconfig
checkoutlist
commitinfo
config
cvswrappers
+group
loginfo
modules
notify
@@ -4719,11 +4755,13 @@ verifymsg"
CVSROOT
CVSROOT:
+access
aclconfig
checkoutlist
commitinfo
config
cvswrappers
+group
loginfo
modules
notify
@@ -4743,11 +4781,13 @@ CVSROOT
notcheckedout
CVSROOT:
+access
aclconfig
checkoutlist
commitinfo
config
cvswrappers
+group
loginfo
modules
notify
@@ -4770,11 +4810,13 @@ CVSROOT
notcheckedout
CVSROOT:
+access
aclconfig
checkoutlist
commitinfo
config
cvswrappers
+group
loginfo
modules
notify
@@ -7519,11 +7561,13 @@ CVSROOT
first-dir
CVSROOT:
+access
aclconfig
checkoutlist
commitinfo
config
cvswrappers
+group
loginfo
modules
notify
@@ -7551,11 +7595,13 @@ d--- $ISO8601DATE CVSROOT
d--- $ISO8601DATE first-dir
CVSROOT:
+---- $ISO8601DATE 1\.[0-9][0-9]* access
---- $ISO8601DATE 1\.[0-9][0-9]* aclconfig
---- $ISO8601DATE 1\.[0-9][0-9]* checkoutlist
---- $ISO8601DATE 1\.[0-9][0-9]* commitinfo
---- $ISO8601DATE 1\.[0-9][0-9]* config
---- $ISO8601DATE 1\.[0-9][0-9]* cvswrappers
+---- $ISO8601DATE 1\.[0-9][0-9]* group
---- $ISO8601DATE 1\.[0-9][0-9]* loginfo
---- $ISO8601DATE 1\.[0-9][0-9]* modules
---- $ISO8601DATE 1\.[0-9][0-9]* notify
@@ -7583,11 +7629,13 @@ D/CVSROOT////
D/first-dir////
CVSROOT:
+/access/1\.[0-9][0-9]*/$DATE//
/aclconfig/1\.[0-9][0-9]*/$DATE//
/checkoutlist/1\.[0-9][0-9]*/$DATE//
/commitinfo/1\.[0-9][0-9]*/$DATE//
/config/1\.[0-9][0-9]*/$DATE//
/cvswrappers/1\.[0-9][0-9]*/$DATE//
+/group/1\.[0-9][0-9]*/$DATE//
/loginfo/1\.[0-9][0-9]*/$DATE//
/modules/1\.[0-9][0-9]*/$DATE//
/notify/1\.[0-9][0-9]*/$DATE//
@@ -7614,11 +7662,13 @@ CVSROOT
first-dir
CVSROOT:
+access
aclconfig
checkoutlist
commitinfo
config
cvswrappers
+group
loginfo
modules
notify
@@ -12215,11 +12265,13 @@ fish"
mkdir keywordexpand; cd keywordexpand
dotest keywordexpand-1 "${testcvs} -q co CVSROOT" \
-'U CVSROOT/aclconfig
+'U CVSROOT/access
+U CVSROOT/aclconfig
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
+U CVSROOT/group
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
@@ -12359,11 +12411,13 @@ $SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/
############################################################
# Check out the whole repository
mkdir 1; cd 1
- dotest modules-1 "${testcvs} -q co ." 'U CVSROOT/aclconfig
+ dotest modules-1 "${testcvs} -q co ." 'U CVSROOT/access
+U CVSROOT/aclconfig
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
+U CVSROOT/group
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
@@ -12386,11 +12440,13 @@ $SPROG commit: Rebuilding administrative
############################################################
# Check out CVSROOT
mkdir 1; cd 1
- dotest modules-2 "${testcvs} -q co CVSROOT" 'U CVSROOT/aclconfig
+ dotest modules-2 "${testcvs} -q co CVSROOT" 'U CVSROOT/access
+U CVSROOT/aclconfig
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
+U CVSROOT/group
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
@@ -12416,11 +12472,13 @@ $SPROG commit: Rebuilding administrative
mkdir 1; cd 1
dotest modules-3 "${testcvs} -q co somedir" ''
cd somedir
- dotest modules-3d "${testcvs} -q co CVSROOT" 'U CVSROOT/aclconfig
+ dotest modules-3d "${testcvs} -q co CVSROOT" 'U CVSROOT/access
+U CVSROOT/aclconfig
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
+U CVSROOT/group
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
@@ -12479,11 +12537,13 @@ initial revision: 1\.1"
cd ..
dotest modules-146 "$testcvs -q co CVSROOT" \
-"U CVSROOT/aclconfig
+"U CVSROOT/access
+U CVSROOT/aclconfig
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
+U CVSROOT/group
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
@@ -13288,11 +13348,13 @@ initial revision: 1\.1"
cd ..
dotest modules5-6 "${testcvs} -q co CVSROOT" \
-"U CVSROOT/aclconfig
+"U CVSROOT/access
+U CVSROOT/aclconfig
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
+U CVSROOT/group
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
@@ -15593,6 +15655,8 @@ RCS file: $CVSROOT_DIRNAME/CVSROOT$DOTST
dotest_fail checkout_repository-2 "${testcvs} co CVSROOT" \
"${CPROG} \[checkout aborted\]: Cannot check out files into the repository itself" \
"${SPROG} checkout: Updating CVSROOT
+${CPROG} checkout: move away \`CVSROOT/access'; it is in the way
+C CVSROOT/access
${CPROG} checkout: move away \`CVSROOT/aclconfig'; it is in the way
C CVSROOT/aclconfig
${CPROG} checkout: move away \`CVSROOT/checkoutlist'; it is in the way
@@ -15603,6 +15667,8 @@ ${CPROG} checkout: move away \`CVSROOT/c
C CVSROOT/config
${CPROG} checkout: move away \`CVSROOT/cvswrappers'; it is in the way
C CVSROOT/cvswrappers
+${CPROG} checkout: move away \`CVSROOT/group'; it is in the way
+C CVSROOT/group
${CPROG} checkout: move away \`CVSROOT/loginfo'; it is in the way
C CVSROOT/loginfo
${CPROG} checkout: move away \`CVSROOT/modules'; it is in the way
@@ -15872,7 +15938,7 @@ EOF
"
Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs
-Action: (continue) ${CPROG} \[commit aborted\]: aborted by user"
+Action: (abort) ${CPROG} \[commit aborted\]: aborted by user"
# Test CVS's response to an empty log message
cat >${TESTDIR}/editme <<EOF
@@ -15886,7 +15952,7 @@ EOF
"
Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs
-Action: (continue) ${CPROG} \[commit aborted\]: aborted by user"
+Action: (abort) ${CPROG} \[commit aborted\]: aborted by user"
# Test CVS's response to a log message with one blank line
cat >${TESTDIR}/editme <<EOF
@@ -15900,7 +15966,7 @@ EOF
"
Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs
-Action: (continue) ${CPROG} \[commit aborted\]: aborted by user"
+Action: (abort) ${CPROG} \[commit aborted\]: aborted by user"
# Test CVS's response to a log message with only comments
cat >${TESTDIR}/editme <<EOF
@@ -15915,7 +15981,7 @@ EOF
"
Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs
-Action: (continue) ${CPROG} \[commit aborted\]: aborted by user"
+Action: (abort) ${CPROG} \[commit aborted\]: aborted by user"
# Test CVS's response to a log message that is zero bytes
# in length. This caused core dumps in cvs 1.11.5 on Solaris
@@ -15943,7 +16009,7 @@ EOF
Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs
-Action: (continue) ${CVSROOT_DIRNAME}/first-dir/file1,v <-- file1
+Action: (abort) ${CVSROOT_DIRNAME}/first-dir/file1,v <-- file1
new revision: 1\.2; previous revision: 1\.1"
# The loginfo Log message should be an empty line and not "(null)"
# which is what some fprintf() implementations do with "%s"
@@ -20036,8 +20102,8 @@ Merging differences between 1.[0-9]* and
echo 'BogusOption=yes' >>config
if $proxy; then
dotest config-4p "$testcvs -q ci -m change-to-bogus-opt" \
-"$SPROG [a-z]*: $SECONDARY_CVSROOT_DIRNAME/CVSROOT/config \[99\]: syntax error: missing \`=' between keyword and value
-$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[99\]: syntax error: missing \`=' between keyword and value
+"$SPROG [a-z]*: $SECONDARY_CVSROOT_DIRNAME/CVSROOT/config \[[1-9][0-9]*\]: syntax error: missing \`=' between keyword and value
+$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[[1-9][0-9]*\]: syntax error: missing \`=' between keyword and value
$CVSROOT_DIRNAME/CVSROOT/config,v <-- config
new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
$SPROG commit: Rebuilding administrative file database"
@@ -20060,7 +20126,7 @@ $SPROG commit: Rebuilding administrative
# The warning is left over from the previous test.
dotest config-5 "$testcvs -q ci -m set-HistoryLogPath" \
-"$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[98\]: unrecognized keyword \`BogusOption'
+"$SPROG [a-z]*: $CVSROOT_DIRNAME/CVSROOT/config \[[1-9][0-9]*\]: unrecognized keyword \`BogusOption'
$CVSROOT_DIRNAME/CVSROOT/config,v <-- config
new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
$SPROG commit: Rebuilding administrative file database"
@@ -20071,7 +20137,6 @@ $SPROG commit: Rebuilding administrative
new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
$SPROG commit: Rebuilding administrative file database"
- sleep 1
echo '# noop' >> config
dotest config-7 "$testcvs -q ci -mlog-commit" \
"$CVSROOT_DIRNAME/CVSROOT/config,v <-- config
@@ -31495,7 +31560,6 @@ echo "Redirect $CVSROOT"
cat >/dev/null
EOF
echo newstuff >file1
- sleep 1
dotest_fail client-20 "$testcvs ci" \
"$CPROG commit: Examining \.
$CPROG \[commit aborted\]: \`Redirect' loop detected\. Server misconfiguration$QUESTION"
@@ -31896,7 +31960,7 @@ EOF
save_CVS_SERVER=$CVS_SERVER
ln -s $PRIMARY_CVSROOT_DIRNAME $TESTDIR/primary_link
dotest writeproxy-0 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
ok
ok
ok" \
@@ -31945,11 +32009,13 @@ EOF
cd ../..
mkdir secondary; cd secondary
dotest writeproxy-1 "$testcvs -qd$SECONDARY_CVSROOT co CVSROOT" \
-"U CVSROOT/aclconfig
+"U CVSROOT/access
+U CVSROOT/aclconfig
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
+U CVSROOT/group
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
@@ -32145,11 +32211,13 @@ EOF
mkdir secondary; cd secondary
dotest writeproxy-noredirect-1 \
"$testcvs -qd'$PRIMARY_CVSROOT' co CVSROOT" \
-"U CVSROOT/aclconfig
+"U CVSROOT/access
+U CVSROOT/aclconfig
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
+U CVSROOT/group
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
@@ -32182,7 +32250,7 @@ PrimaryServer=$PRIMARY_CVSROOT"
mv $TESTDIR/save-root $PRIMARY_CVSROOT_DIRNAME
dotest writeproxy-noredirect-5 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
ok
ok
ok
@@ -32214,7 +32282,7 @@ EOF
cd firstdir
echo now you see me >file1
dotest writeproxy-noredirect-6 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
ok
ok
ok
@@ -32244,7 +32312,7 @@ EOF
echo /file1/0/dummy+timestamp// >>CVS/Entries
dotest writeproxy-noredirect-7 "$CVS_SERVER server" \
-"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
+"Valid-requests Root Valid-responses valid-requests Command-prep Referrer Repository Directory Relative-directory Max-dotdot Static-directory Sticky Checkin-prog Update-prog Entry Kopt Checkin-time Modified Is-modified UseUnchanged Unchanged Notify Hostname LocalDir Questionable Argument Argumentx Global_option Gzip-stream wrapper-sendme-rcsOptions Set ${DOTSTAR}expand-modules ci co update diff log rlog acl racl list rlist global-list-quiet ls add remove update-patches gzip-file-contents status rdiff tag rtag import admin export history release watch-on watch-off watch-add watch-remove watchers editors edit init annotate rannotate noop version
ok
ok
Mode u=rw,g=rw,o=r
@@ -32571,11 +32639,13 @@ EOF
dotest_sort trace-1 "${testcvs} -t -t -t init" \
" *-> Lock_Cleanup()
+ *-> RCS_checkout (access,v, , , , \.#[0-9][0-9]*)
*-> RCS_checkout (aclconfig,v, , , , \.#[0-9][0-9]*)
*-> RCS_checkout (checkoutlist,v, , , , \.#[0-9][0-9]*)
*-> RCS_checkout (commitinfo,v, , , , \.#[0-9][0-9]*)
*-> RCS_checkout (config,v, , , , \.#[0-9][0-9]*)
*-> RCS_checkout (cvswrappers,v, , , , \.#[0-9][0-9]*)
+ *-> RCS_checkout (group,v, , , , \.#[0-9][0-9]*)
*-> RCS_checkout (loginfo,v, , , , \.#[0-9][0-9]*)
*-> RCS_checkout (modules,v, , , , \.#[0-9][0-9]*)
*-> RCS_checkout (notify,v, , , , \.#[0-9][0-9]*)
@@ -32604,11 +32674,13 @@ EOF
*-> unlink_file(\.#[0-9][0-9]*)
*-> unlink_file(\.#[0-9][0-9]*)
*-> unlink_file(\.#[0-9][0-9]*)
+ *-> unlink_file(\.#access)
*-> unlink_file(\.#aclconfig)
*-> unlink_file(\.#checkoutlist)
*-> unlink_file(\.#commitinfo)
*-> unlink_file(\.#config)
*-> unlink_file(\.#cvswrappers)
+ *-> unlink_file(\.#group)
*-> unlink_file(\.#loginfo)
*-> unlink_file(\.#modules)
*-> unlink_file(\.#notify)
@@ -32632,11 +32704,13 @@ EOF
S -> CVS_SERVER_SLEEP not set\.
S -> Lock_Cleanup()
S -> Lock_Cleanup()
+S -> RCS_checkout (access,v, , , , \.#[0-9][0-9]*)
S -> RCS_checkout (aclconfig,v, , , , \.#[0-9][0-9]*)
S -> RCS_checkout (checkoutlist,v, , , , \.#[0-9][0-9]*)
S -> RCS_checkout (commitinfo,v, , , , \.#[0-9][0-9]*)
S -> RCS_checkout (config,v, , , , \.#[0-9][0-9]*)
S -> RCS_checkout (cvswrappers,v, , , , \.#[0-9][0-9]*)
+S -> RCS_checkout (group,v, , , , \.#[0-9][0-9]*)
S -> RCS_checkout (loginfo,v, , , , \.#[0-9][0-9]*)
S -> RCS_checkout (modules,v, , , , \.#[0-9][0-9]*)
S -> RCS_checkout (notify,v, , , , \.#[0-9][0-9]*)
@@ -32669,11 +32743,13 @@ S -> unlink_file(\.#[0-9][0-9]*)
S -> unlink_file(\.#[0-9][0-9]*)
S -> unlink_file(\.#[0-9][0-9]*)
S -> unlink_file(\.#[0-9][0-9]*)
+S -> unlink_file(\.#access)
S -> unlink_file(\.#aclconfig)
S -> unlink_file(\.#checkoutlist)
S -> unlink_file(\.#commitinfo)
S -> unlink_file(\.#config)
S -> unlink_file(\.#cvswrappers)
+S -> unlink_file(\.#group)
S -> unlink_file(\.#loginfo)
S -> unlink_file(\.#modules)
S -> unlink_file(\.#notify)
