CVS update: /ccvs/src/

User: dprice  
Date: 05/06/02 12:05:20

Modified:
 /ccvs/src/
  ChangeLog, sanity.sh

Log:
 * sanity.sh (config): Simplify cleanup.

File Changes:

Directory: /ccvs/src/
=====================

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/ChangeLog?r1=1.3204&r2=1.3205
Delta lines:  +4 -0
-------------------
--- ChangeLog	2 Jun 2005 17:53:00 -0000	1.3204
+++ ChangeLog	2 Jun 2005 19:05:17 -0000	1.3205
@@ -1,5 +1,9 @@
 2005-06-02  Derek Price  <[email protected]>
 
+	* sanity.sh (config): Simplify cleanup.
+
+2005-06-02  Derek Price  <[email protected]>
+
 	* zlib.c (compress_buffer_input): Don't request more bytes from the
 	underlying buffer than asked for.
 	(compress_buffer_shutdown_input): Don't attempt to read EOF from the

File [changed]: sanity.sh
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/sanity.sh?r1=1.1066&r2=1.1067
Delta lines:  +2 -17
--------------------
--- sanity.sh	2 Jun 2005 17:53:00 -0000	1.1066
+++ sanity.sh	2 Jun 2005 19:05:18 -0000	1.1067
@@ -19894,24 +19894,9 @@
 	    rm -r $TESTDIR/historylogs
 	  fi
 
-	  # $DOTSTAR in the next two tests is needed because of discrepancies
-	  # between normal and proxy modes.
-	  dotest config-cleanup-1 "$testcvs -Q update -jHEAD -jconfig-start" \
-"${DOTSTAR}RCS file: $CVSROOT_DIRNAME/CVSROOT/config,v
-
-
-Merging differences between 1.[0-9]* and 1.[0-9]* into config"
-	  dotest config-cleanup-2 "$testcvs -q ci -m change-to-comment" \
-"$DOTSTAR$CVSROOT_DIRNAME/CVSROOT/config,v  <--  config
-new revision: 1\.[0-9]*; previous revision: 1\.[0-9]*
-$DOTSTAR$SPROG commit: Rebuilding administrative file database"
-
-	  dotest config-6 "$testcvs -q update"
-
 	  dokeep
-	  cd ..
-	  rm -r CVSROOT
-	  cd ..
+	  restore_adm
+	  cd ../..
 	  rm -r wnt
 	  ;;