38 |
usage |
usage |
39 |
echo |
echo |
40 |
echo "-H|--help display this text" |
echo "-H|--help display this text" |
41 |
|
echo "-q Reduce verbosity." |
42 |
echo "-c CONFIG-FILE" |
echo "-c CONFIG-FILE" |
43 |
echo "--config=CONFIG_FILE" |
echo "--config=CONFIG_FILE" |
44 |
echo " use an alternate test suite config file (defaults to" |
echo " use an alternate test suite config file (defaults to" |
75 |
echo " use CVS-FOR-CVS-SERVER as the path to the CVS SERVER" |
echo " use CVS-FOR-CVS-SERVER as the path to the CVS SERVER" |
76 |
echo " executable to be tested (defaults to CVS-TO-TEST and" |
echo " executable to be tested (defaults to CVS-TO-TEST and" |
77 |
echo " implies --remote)" |
echo " implies --remote)" |
78 |
|
echo "-B|--no-bases suppress use of Base files." |
79 |
echo |
echo |
80 |
echo "CVS-TO-TEST the path to the CVS executable to be tested; used as" |
echo "CVS-TO-TEST the path to the CVS executable to be tested; used as" |
81 |
echo " the path to the CVS client when CVS-FOR-CVS-SERVER is" |
echo " the path to the CVS client when CVS-FOR-CVS-SERVER is" |
127 |
unset fromtest |
unset fromtest |
128 |
unset remotehost |
unset remotehost |
129 |
unset rootoptions |
unset rootoptions |
130 |
|
unset CVSNOBASES |
131 |
keep=false |
keep=false |
132 |
linkroot=false |
linkroot=false |
133 |
noredirect=false |
noredirect=false |
134 |
proxy=false |
proxy=false |
135 |
|
quiet=false |
136 |
remote=false |
remote=false |
137 |
servercvs=false |
servercvs=false |
138 |
skipfail=false |
skipfail=false |
139 |
while getopts Hc:ef:h:klnprs:-: option ; do |
while getopts BHc:ef:h:klnpqrs:-: option ; do |
140 |
# convert the long opts to short opts |
# convert the long opts to short opts |
141 |
if test x$option = x-; then |
if test x$option = x-; then |
142 |
# remove any argument |
# remove any argument |
208 |
esac |
esac |
209 |
fi |
fi |
210 |
case "$option" in |
case "$option" in |
211 |
|
B) |
212 |
|
export CVSNOBASES=: |
213 |
|
;; |
214 |
c) |
c) |
215 |
configfile="$OPTARG" |
configfile="$OPTARG" |
216 |
;; |
;; |
250 |
proxy=: |
proxy=: |
251 |
remote=: |
remote=: |
252 |
;; |
;; |
253 |
|
q) |
254 |
|
quiet=: |
255 |
|
;; |
256 |
r) |
r) |
257 |
remote=: |
remote=: |
258 |
;; |
;; |
442 |
# "debugger" |
# "debugger" |
443 |
#set -x |
#set -x |
444 |
|
|
445 |
echo 'This test should produce no other output than this message, and a final "OK".' |
if $quiet; then :; else |
446 |
echo '(Note that the test can take an hour or more to run and periodically stops' |
cat <<EOF |
447 |
echo 'for as long as one minute. Do not assume there is a problem just because' |
This test should produce no other output than this message, and a final "OK". |
448 |
echo 'nothing seems to happen for a long time. If you cannot live without' |
(Note that the test can take an hour or more to run and periodically stops |
449 |
echo "running status, try the command: \`tail -f check.log' from another window.)" |
for as long as one minute. Do not assume there is a problem just because |
450 |
|
nothing seems to happen for a long time. If you cannot live without |
451 |
|
running status, try the command: \`tail -f check.log' from another window.) |
452 |
|
EOF |
453 |
|
fi |
454 |
|
|
455 |
# Regexp to match what the CVS client will call itself in output that it prints. |
# Regexp to match what the CVS client will call itself in output that it prints. |
456 |
# FIXME: we don't properly quote this--if the name contains . we'll |
# FIXME: we don't properly quote this--if the name contains . we'll |
4863 |
T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-tag:rtagged-by-head\] |
T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-tag:rtagged-by-head\] |
4864 |
T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-revision:1\.1\] |
T [0-9-]* [0-9:]* ${PLUS}0000 ${username} first-dir \[rtagged-by-revision:1\.1\] |
4865 |
O [0-9-]* [0-9:]* ${PLUS}0000 ${username} \[1\.1\] first-dir =first-dir= <remote>/\* |
O [0-9-]* [0-9:]* ${PLUS}0000 ${username} \[1\.1\] first-dir =first-dir= <remote>/\* |
4866 |
U [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6 first-dir == <remote> |
[UP] [0-9-]* [0-9:]* ${PLUS}0000 ${username} 1\.2 file6 first-dir == <remote> |
4867 |
W [0-9-]* [0-9:]* ${PLUS}0000 ${username} file7 first-dir == <remote>" |
W [0-9-]* [0-9:]* ${PLUS}0000 ${username} file7 first-dir == <remote>" |
4868 |
fi |
fi |
4869 |
|
|
6294 |
# back to branch1 |
# back to branch1 |
6295 |
dotest death-93 "$testcvs -q update -r branch1" \ |
dotest death-93 "$testcvs -q update -r branch1" \ |
6296 |
"U file1 |
"U file1 |
6297 |
U file3" |
[UP] file3" |
6298 |
|
|
6299 |
dotest_fail death-file4-6 "test -f file4" |
dotest_fail death-file4-6 "test -f file4" |
6300 |
dotest death-94 "test -f file1" |
dotest death-94 "test -f file1" |
8868 |
else |
else |
8869 |
modify_repo ln -s Attic/file3,v $CVSROOT_DIRNAME/first-dir/file2,v |
modify_repo ln -s Attic/file3,v $CVSROOT_DIRNAME/first-dir/file2,v |
8870 |
fi |
fi |
8871 |
if $remote; then |
if $remote && test -z "$CVSNOBASES"; then |
8872 |
dotest_fail rcslib-symlink-3gr "$testcvs update file2" \ |
dotest_fail rcslib-symlink-3gr "$testcvs update file2" \ |
8873 |
"$SPROG \[update aborted\]: could not find desired version 1\.1\.2\.3 in $CVSROOT_DIRNAME/first-dir/file2,v" |
"$SPROG \[update aborted\]: could not find desired version 1\.1\.2\.3 in $CVSROOT_DIRNAME/first-dir/file2,v" |
8874 |
else |
else |
17548 |
new revision: 1\.2; previous revision: 1\.1" |
new revision: 1\.2; previous revision: 1\.1" |
17549 |
cd ../.. |
cd ../.. |
17550 |
cd 2/x |
cd 2/x |
|
test -f CVS/Base/.#m.1.1.1.1 || exit |
|
17551 |
dotest unedit-without-baserev-13 "$testcvs -q update" \ |
dotest unedit-without-baserev-13 "$testcvs -q update" \ |
17552 |
"Merging differences between 1\.1\.1\.1 and 1\.2 into \`m' |
"Merging differences between 1\.1\.1\.1 and 1\.2 into \`m' |
17553 |
$CPROG update: conflicts during merge |
$CPROG update: conflicts during merge |
17554 |
C m" |
C m" |
|
test -f CVS/Base/.#m.1.2 || exit |
|
17555 |
rm CVS/Baserev |
rm CVS/Baserev |
17556 |
dotest unedit-without-baserev-14 "echo yes |${testcvs} unedit m" \ |
dotest unedit-without-baserev-14 "echo yes |${testcvs} unedit m" \ |
17557 |
"m has been modified; revert changes${QUESTION} ${CPROG} unedit: m not mentioned in CVS/Baserev |
"m has been modified; revert changes${QUESTION} ${CPROG} unedit: m not mentioned in CVS/Baserev |
17558 |
${CPROG} unedit: run update to complete the unedit" |
${CPROG} unedit: run update to complete the unedit" |
|
test -f CVS/Base/.#m.1.2 || exit |
|
17559 |
dotest unedit-without-baserev-15 "${testcvs} -q update" \ |
dotest unedit-without-baserev-15 "${testcvs} -q update" \ |
17560 |
"$SPROG update: warning: \`m' was lost |
"$SPROG update: warning: \`m' was lost |
17561 |
U m" |
U m" |
|
test -f CVS/Base/.#m.1.2 || exit |
|
17562 |
# The following tests are kind of degenerate compared with |
# The following tests are kind of degenerate compared with |
17563 |
# watch4-16 through watch4-18 but might as well make sure that |
# watch4-16 through watch4-18 but might as well make sure that |
17564 |
# nothing seriously wrong has happened to the working directory. |
# nothing seriously wrong has happened to the working directory. |