[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch]
|
From: |
Larry Jones |
|
Subject: |
[Cvs-cvs] ccvs/src ChangeLog sanity.sh [cvs1-11-x-branch] |
|
Date: |
Wed, 24 May 2006 17:07:23 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Branch: cvs1-11-x-branch
Changes by: Larry Jones <address@hidden> 06/05/24 17:07:21
Modified files:
src : ChangeLog sanity.sh
Log message:
* sanity.sh: Add -v|--verbose option to echo test names. Clean
up help message.
Remove val-tags files for cleanup instead of truncating since the
truncation code doesn't work right on Solaris. Always use -f when
removing val-tags.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=cvs1-11-x-branch&tr1=1.2336.2.450&tr2=1.2336.2.451&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?only_with_tag=cvs1-11-x-branch&tr1=1.752.2.196&tr2=1.752.2.197&r1=text&r2=text
Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.2336.2.450 ccvs/src/ChangeLog:1.2336.2.451
--- ccvs/src/ChangeLog:1.2336.2.450 Tue May 23 02:02:36 2006
+++ ccvs/src/ChangeLog Wed May 24 17:07:20 2006
@@ -1,3 +1,11 @@
+2006-05-24 Larry Jones <address@hidden>
+
+ * sanity.sh: Add -v|--verbose option to echo test names. Clean
+ up help message.
+ Remove val-tags files for cleanup instead of truncating since the
+ truncation code doesn't work right on Solaris. Always use -f when
+ removing val-tags.
+
2006-05-22 Derek Price <address@hidden>
* rcs.c (RCS_reparsercsfile, RCS_fully_parse, RCS_checkout, RCS_deltas,
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.752.2.196 ccvs/src/sanity.sh:1.752.2.197
--- ccvs/src/sanity.sh:1.752.2.196 Tue May 23 02:02:36 2006
+++ ccvs/src/sanity.sh Wed May 24 17:07:20 2006
@@ -22,7 +22,7 @@
usage ()
{
echo "Usage: `basename $0` --help"
- echo "Usage: `basename $0` [-eklr] [-f FROM-TEST] [-h HOSTNAME]
CVS-TO-TEST [TESTS-TO-RUN...]"
+ echo "Usage: `basename $0` [-eklrv] [-f FROM-TEST] [-h HOSTNAME]
CVS-TO-TEST [TESTS-TO-RUN...]"
}
exit_usage ()
@@ -35,26 +35,27 @@
{
usage
echo
- echo "-H|--help display this text"
+ echo "-H|--help Display this text."
echo "-e|--skipfail Treat tests that would otherwise be nonfatally skipped"
echo " for reasons like missing tools as failures, exiting"
echo " with an error message. Also treat warnings as"
- echo " failures."
- echo "-f FROM-TEST run TESTS-TO-RUN, skipping all tests in the list before"
- echo " FROM-TEST"
+ echo " failures."
+ echo "-f FROM-TEST Run TESTS-TO-RUN, skipping all tests in the list
before"
+ echo " FROM-TEST."
echo "-h HOSTNAME Use :ext:HOSTNAME to run remote tests rather than"
echo " :fork:. Implies --remote and assumes that \$TESTDIR"
echo " resolves to the same directory on both the client and"
echo " the server."
- echo "-k|--keep try to keep directories created by individual tests"
- echo " around, exiting after the first test which supports"
- echo " --keep"
+ echo "-k|--keep Try to keep directories created by individual tests"
+ echo " around, exiting after the first test which supports"
+ echo " --keep."
echo "-l|--link-root"
- echo " test CVS using a symlink to a real CVSROOT"
- echo "-r|--remote test remote instead of local cvs"
+ echo " Test CVS using a symlink to a real CVSROOT."
+ echo "-r|--remote Test remote instead of local cvs."
+ echo "-v|--verbose List test names as they are executed."
echo
- echo "CVS-TO-TEST the path to the CVS executable to be tested"
- echo "TESTS-TO-RUN the names of the tests to run (defaults to all tests)"
+ echo "CVS-TO-TEST The path to the CVS executable to be tested."
+ echo "TESTS-TO-RUN The names of the tests to run (defaults to all tests)."
exit 2
}
@@ -97,7 +98,8 @@
linkroot=false
remote=false
skipfail=false
-while getopts ef:h:Hklr-: option ; do
+verbose=false
+while getopts ef:h:Hklrv-: option ; do
# convert the long opts to short opts
if test x$option = x-; then
case "$OPTARG" in
@@ -121,6 +123,10 @@
option=e
OPTARG=
;;
+ v|ve|ver|verb|verbo|verbos|verbose)
+ option=v
+ OPTARG=
+ ;;
*)
option=\?
OPTARG=
@@ -157,6 +163,9 @@
r)
remote=:
;;
+ v)
+ verbose=:
+ ;;
\?)
exit_usage
;;
@@ -207,7 +216,8 @@
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. If you cannot live without'
-echo "running status, try the command: \`tail -f check.log' from another
window.)"
+echo 'running status, use the -v option or try the command:'
+echo "\`tail -f check.log' from another window.)"
# 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
@@ -2078,6 +2088,11 @@
continue
fi
fi
+
+ if $verbose; then
+ echo "$what:"
+ fi
+
case $what in
version)
@@ -15708,7 +15723,7 @@
# Now do it again, after removing the val-tags file created
# by devcom-t1 to force CVS to search the repository
# containing CVS directories.
- rm ${CVSROOT_DIRNAME}/CVSROOT/val-tags
+ rm -f ${CVSROOT_DIRNAME}/CVSROOT/val-tags
mkdir 3
cd 3
dotest devcom-t3 "${testcvs} -q co -rtag first-dir" \
@@ -20826,7 +20841,7 @@
dotest lockfiles-21 "$testcvs -Q tag newtag first-dir"
- rm $CVSROOT_DIRNAME/CVSROOT/val-tags
+ rm -f $CVSROOT_DIRNAME/CVSROOT/val-tags
mkdir "$TESTDIR/locks/CVSROOT/#cvs.val-tags.lock"
(sleep 5; rmdir "$TESTDIR/locks/CVSROOT/#cvs.val-tags.lock")&
dotest lockfiles-22 "$testcvs -q up -r newtag first-dir" \
@@ -29354,9 +29369,8 @@
fi
# Reset val-tags to a pristine state.
- if test -s $CVSROOT_DIRNAME/CVSROOT/val-tags; then
- : > $CVSROOT_DIRNAME/CVSROOT/val-tags
- fi
+ rm -f $CVSROOT_DIRNAME/CVSROOT/val-tags
+
verify_tmp_empty "post $what"
done # The big loop