1627 |
tests="${tests} close-stdout" |
tests="${tests} close-stdout" |
1628 |
tests="$tests debug-log-nonfatal" |
tests="$tests debug-log-nonfatal" |
1629 |
# Watches, binary files, history browsing, &c. |
# Watches, binary files, history browsing, &c. |
1630 |
tests="${tests} devcom devcom2 devcom3 watch4 watch5" |
tests="${tests} devcom devcom2 devcom3 watch4 watch5 watch6-0 watch6" |
1631 |
tests="${tests} edit-check" |
tests="${tests} edit-check" |
1632 |
tests="${tests} unedit-without-baserev" |
tests="${tests} unedit-without-baserev" |
1633 |
tests="${tests} ignore ignore-on-branch binfiles binfiles2 binfiles3" |
tests="${tests} ignore ignore-on-branch binfiles binfiles2 binfiles3" |
2570 |
fi |
fi |
2571 |
CVSROOT_DIRNAME=${TESTDIR}/cvsroot |
CVSROOT_DIRNAME=${TESTDIR}/cvsroot |
2572 |
CVSROOT=`newroot $CVSROOT_DIRNAME`; export CVSROOT |
CVSROOT=`newroot $CVSROOT_DIRNAME`; export CVSROOT |
2573 |
|
echo CVSROOT: ${CVSROOT} |
2574 |
|
|
2575 |
|
|
2576 |
### |
### |
16961 |
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir |
modify_repo rm -rf $CVSROOT_DIRNAME/first-dir |
16962 |
;; |
;; |
16963 |
|
|
16964 |
|
watch6-0) |
16965 |
|
|
16966 |
|
# Make sure that default attributes are being set properly. |
16967 |
|
# Specifying a directory has, it seems, never worked, |
16968 |
|
# and 1.12.10 broke it completely. |
16969 |
|
mkdir watch6-0; cd watch6-0 |
16970 |
|
|
16971 |
|
dotest watch6-0-setup-1 "$testcvs -Q co -ldtop ." |
16972 |
|
cd top |
16973 |
|
mkdir watch6-0 |
16974 |
|
dotest watch6-0-setup-2 "$testcvs -Q add watch6-0" |
16975 |
|
cd watch6-0 |
16976 |
|
dotest watch6-0-1 "$testcvs watch add" |
16977 |
|
dotest watch6-0-2 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr" |
16978 |
|
dotest watch6-0-3 "$testcvs watch remove" |
16979 |
|
dotest_fail watch6-0-4 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>/dev/null" |
16980 |
|
|
16981 |
|
dotest watch6-0-5 "$testcvs watch add ." |
16982 |
|
dotest watch6-0-6 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr" |
16983 |
|
dotest watch6-0-7 "$testcvs watch remove ." |
16984 |
|
dotest_fail watch6-0-8 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>/dev/null" |
16985 |
|
|
16986 |
|
# OK, basic add/remove work. Now, make sure it works with named directories |
16987 |
|
mkdir dir1 |
16988 |
|
mkdir dir2 |
16989 |
|
mkdir dir3 |
16990 |
|
echo afile>afile |
16991 |
|
$testcvs -Q add afile dir1 dir2 dir3 |
16992 |
|
$testcvs -Q ci -m "Adding test files" |
16993 |
|
|
16994 |
|
# Current directory should not be watched, but there should be a watch on the file, |
16995 |
|
# and on dir1 & dir2, but not on dir3. |
16996 |
|
dotest watch6-0-9 "$testcvs -Q watch add afile dir1 dir2" |
16997 |
|
dotest_fail watch6-0-10 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr 2>/dev/null" |
16998 |
|
dotest watch6-0-11 "grep -qE '^Fafile' $CVSROOT_DIRNAME/watch6-0/CVS/fileattr" |
16999 |
|
dotest watch6-0-12 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir1/CVS/fileattr" |
17000 |
|
dotest watch6-0-13 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir2/CVS/fileattr" |
17001 |
|
dotest_fail watch6-0-12 "grep -qE '^D' $CVSROOT_DIRNAME/watch6-0/dir3/CVS/fileattr 2>/dev/null" |
17002 |
|
|
17003 |
|
if $keep; then |
17004 |
|
echo Keeping $TESTDIR and exiting due to --keep |
17005 |
|
exit 0 |
17006 |
|
fi |
17007 |
|
cd ../../.. |
17008 |
|
rm -rf watch6 |
17009 |
|
rm -rf $CVSROOT_DIRNAME/watch6 |
17010 |
|
|
17011 |
|
;; |
17012 |
|
|
17013 |
|
watch6) |
17014 |
|
# Check that `cvs watch on' does not reset the fileattr file. |
17015 |
|
mkdir watch6; cd watch6 |
17016 |
|
|
17017 |
|
dotest watch6-setup-1 "$testcvs -Q co -ldtop ." |
17018 |
|
cd top |
17019 |
|
mkdir watch6 |
17020 |
|
dotest watch6-setup-2 "$testcvs -Q add watch6" |
17021 |
|
|
17022 |
|
# I don't recall why I had these next 3 lines. |
17023 |
|
cd .. |
17024 |
|
dotest watch6-setup-3 "$testcvs -Q co watch6" |
17025 |
|
cd watch6 |
17026 |
|
|
17027 |
|
mkdir subdir |
17028 |
|
dotest watch6-setup-4 "$testcvs -Q add subdir" |
17029 |
|
cd subdir |
17030 |
|
|
17031 |
|
# START watch add/remove sequence |
17032 |
|
dotest watch6-1 "$testcvs -Q watch add" |
17033 |
|
dotest watch6-2 \ |
17034 |
|
"grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17035 |
|
|
17036 |
|
dotest watch6-3 "$testcvs watch on" |
17037 |
|
dotest watch6-4 \ |
17038 |
|
"grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17039 |
|
dotest watch6-5 \ |
17040 |
|
"grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17041 |
|
|
17042 |
|
dotest watch6-6 "$testcvs watch off" |
17043 |
|
dotest watch6-7 \ |
17044 |
|
"grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17045 |
|
dotest_fail watch6-8 \ |
17046 |
|
"grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17047 |
|
|
17048 |
|
dotest watch6-9 "$testcvs watch remove" |
17049 |
|
dotest_fail watch6-10 \ |
17050 |
|
"test -d $CVSROOT_DIRNAME/test-directory/subdir/CVS" |
17051 |
|
dotest_fail watch6-11 \ |
17052 |
|
"test -f $CVSROOT_DIRNAME/test-directory/subdir/CVS/fileattr" |
17053 |
|
# END watch add/remove sequence |
17054 |
|
|
17055 |
|
echo Hi there >afile |
17056 |
|
dotest watch6-12 "$testcvs -Q add afile" |
17057 |
|
dotest watch6-13 "$testcvs ci -m 'A file' afile" \ |
17058 |
|
"$CVSROOT_DIRNAME/watch6/subdir/afile,v <-- afile |
17059 |
|
initial revision: 1.1" |
17060 |
|
|
17061 |
|
# START watch add/remove sequence |
17062 |
|
dotest watch6-14 "$testcvs -Q watch add" |
17063 |
|
dotest watch6-15 \ |
17064 |
|
"grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17065 |
|
|
17066 |
|
dotest watch6-16 "$testcvs watch on" |
17067 |
|
dotest watch6-17 \ |
17068 |
|
"grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17069 |
|
dotest watch6-18 \ |
17070 |
|
"grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17071 |
|
|
17072 |
|
dotest watch6-19 "$testcvs watch off" |
17073 |
|
dotest watch6-20 \ |
17074 |
|
"grep '_watchers' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17075 |
|
dotest_fail watch6-21 \ |
17076 |
|
"grep '_watched' $CVSROOT_DIRNAME/watch6/subdir/CVS/fileattr >/dev/null" |
17077 |
|
|
17078 |
|
dotest watch6-22 "$testcvs watch remove" |
17079 |
|
dotest_fail watch6-23 \ |
17080 |
|
"test -d $CVSROOT_DIRNAME/test-directory/subdir/CVS" |
17081 |
|
dotest_fail watch6-24 \ |
17082 |
|
"test -f $CVSROOT_DIRNAME/test-directory/subdir/CVS/fileattr" |
17083 |
|
# END watch add/remove sequence |
17084 |
|
|
17085 |
|
if $keep; then |
17086 |
|
echo Keeping $TESTDIR and exiting due to --keep |
17087 |
|
exit 0 |
17088 |
|
fi |
17089 |
|
cd ../../.. |
17090 |
|
rm -r watch6 |
17091 |
|
rm -rf $CVSROOT_DIRNAME/watch6 |
17092 |
|
;; |
17093 |
|
|
17094 |
|
|
17095 |
|
|
17096 |
edit-check) |
edit-check) |