20145 |
rm -r wnt |
rm -r wnt |
20146 |
;; |
;; |
20147 |
|
|
20148 |
|
config3) |
20149 |
|
# Verify comments, white space, & [rootspecs] in CVSROOT/config |
20150 |
|
# |
20151 |
|
# `cvs server' `-c' option tested in `server' test |
20152 |
|
modify_repo mkdir $CVSROOT_DIRNAME/config3 |
20153 |
|
mkdir config3 |
20154 |
|
cd config3 |
20155 |
|
|
20156 |
|
dotest config3-init-1 "$testcvs -q co CVSROOT" "U CVSROOT/$DOTSTAR" |
20157 |
|
cd CVSROOT |
20158 |
|
|
20159 |
|
# I break the usual sanity.sh indentation standard for here-docs |
20160 |
|
# mostly to test that leading white-space is now ignored. |
20161 |
|
cat <<EOF >config |
20162 |
|
# Ignore a comment with leading spaces. |
20163 |
|
GLOBAL-BAD-OPTION=WWW |
20164 |
|
|
20165 |
|
[/ignore/this/root] |
20166 |
|
[/and/this/one] |
20167 |
|
IGNORED-BAD-OPTION=YYY |
20168 |
|
EOF |
20169 |
|
dotest config3-init-2 \ |
20170 |
|
"$testcvs -q ci -m test-root-specs" \ |
20171 |
|
"$CVSROOT_DIRNAME/CVSROOT/config,v <-- config |
20172 |
|
new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* |
20173 |
|
$SPROG commit: Rebuilding administrative file database" |
20174 |
|
|
20175 |
|
cd .. |
20176 |
|
dotest config3-1 "$testcvs co config3" \ |
20177 |
|
"$SPROG checkout: $CVSROOT_DIRNAME/CVSROOT/config \[2\]: unrecognized keyword \`GLOBAL-BAD-OPTION' |
20178 |
|
$SPROG checkout: Updating config3" |
20179 |
|
|
20180 |
|
cd CVSROOT |
20181 |
|
cat <<EOF >config |
20182 |
|
# Ignore a comment with leading spaces. |
20183 |
|
|
20184 |
|
[/ignore/this/root] |
20185 |
|
[/and/this/one] |
20186 |
|
IGNORED-BAD-OPTION=YYY |
20187 |
|
# Ignore a comment with leading spaces. |
20188 |
|
|
20189 |
|
[/some/other/root] |
20190 |
|
|
20191 |
|
# Comments and blank lines do not affect fall-through behavior. |
20192 |
|
|
20193 |
|
[$CVSROOT_DIRNAME] |
20194 |
|
|
20195 |
|
# Comments and blank lines do not affect fall-through behavior. |
20196 |
|
|
20197 |
|
[/yet/another/root] |
20198 |
|
# Ignore a comment with leading spaces. |
20199 |
|
PROCESS-BAD-OPTION=XXX |
20200 |
|
EOF |
20201 |
|
dotest config3-init-3 \ |
20202 |
|
"$testcvs -q ci -m test-root-specs" \ |
20203 |
|
"$SPROG commit: $CVSROOT_DIRNAME/CVSROOT/config \[2\]: unrecognized keyword \`GLOBAL-BAD-OPTION' |
20204 |
|
$CVSROOT_DIRNAME/CVSROOT/config,v <-- config |
20205 |
|
new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* |
20206 |
|
$SPROG commit: Rebuilding administrative file database" |
20207 |
|
|
20208 |
|
cd .. |
20209 |
|
dotest config3-2 "$testcvs co config3" \ |
20210 |
|
"$SPROG checkout: $CVSROOT_DIRNAME/CVSROOT/config \[18\]: unrecognized keyword \`PROCESS-BAD-OPTION' |
20211 |
|
$SPROG checkout: Updating config3" |
20212 |
|
|
20213 |
|
# The next few tests make sure both global options and root |
20214 |
|
# specific options are processed by setting the history log and |
20215 |
|
# search paths in different locations and then verifying that |
20216 |
|
# both registered. It also verifies that a key for a different |
20217 |
|
# root is ignored. |
20218 |
|
cd CVSROOT |
20219 |
|
cat <<EOF >config |
20220 |
|
HistoryLogPath=$TESTDIR/historylog |
20221 |
|
|
20222 |
|
[/ignore/this/root] |
20223 |
|
[/and/this/one] |
20224 |
|
IGNORED-BAD-OPTION=YYY |
20225 |
|
|
20226 |
|
[/some/other/root] |
20227 |
|
[$CVSROOT_DIRNAME] |
20228 |
|
[/yet/another/root] |
20229 |
|
HistorySearchPath=$TESTDIR/historylog |
20230 |
|
|
20231 |
|
[/ignore/another/root] |
20232 |
|
[/and/this/one/too] |
20233 |
|
ANOTHER-IGNORED-BAD-OPTION=ZZZ |
20234 |
|
|
20235 |
|
[$CVSROOT_DIRNAME] |
20236 |
|
LogHistory=TMAR |
20237 |
|
EOF |
20238 |
|
dotest config3-init-4 \ |
20239 |
|
"$testcvs -q ci -m test-root-specs" \ |
20240 |
|
"$SPROG commit: $CVSROOT_DIRNAME/CVSROOT/config \[18\]: unrecognized keyword \`PROCESS-BAD-OPTION' |
20241 |
|
$CVSROOT_DIRNAME/CVSROOT/config,v <-- config |
20242 |
|
new revision: 1\.[0-9]*; previous revision: 1\.[0-9]* |
20243 |
|
$SPROG commit: Rebuilding administrative file database" |
20244 |
|
|
20245 |
|
cd .. |
20246 |
|
dotest config3-3 "$testcvs co -d config3-2 config3" \ |
20247 |
|
"$SPROG checkout: Updating config3-2" |
20248 |
|
|
20249 |
|
cd config3-2 |
20250 |
|
touch newfile |
20251 |
|
dotest config3-4 "$testcvs -Q add newfile" |
20252 |
|
dotest config3-5 "$testcvs -q ci -madd-file" \ |
20253 |
|
"$CVSROOT_DIRNAME/config3/newfile,v <-- newfile |
20254 |
|
initial revision: 1\.1" |
20255 |
|
|
20256 |
|
dotest config3-6 "$testcvs rtag testtag config3" \ |
20257 |
|
"$SPROG rtag: Tagging config3" |
20258 |
|
|
20259 |
|
cd .. |
20260 |
|
dotest config3-7 "$testcvs history -ea" \ |
20261 |
|
"A [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.1 newfile config3 == $TESTDIR/config3/config3-2 |
20262 |
|
T [0-9-]* [0-9:]* ${PLUS}0000 $username config3 \[testtag:A\]" |
20263 |
|
|
20264 |
|
dokeep |
20265 |
|
restore_adm |
20266 |
|
cd .. |
20267 |
|
rm -r config3 |
20268 |
|
modify_repo rm -rf $CVSROOT_DIRNAME/config3 |
20269 |
|
;; |
20270 |
|
|
20271 |
|
|
20272 |
|
|
20273 |
serverpatch) |
serverpatch) |