CVS update: /ccvs/src/

User: dprice  
Date: 05/05/18 11:50:14

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

Log:
 * sanity.sh (config-9): Split to local/remote tests to avoid unportable
 expr characters.

File Changes:

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

File [changed]: ChangeLog
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/ChangeLog?r1=1.3193&r2=1.3194
Delta lines:  +5 -0
-------------------
--- ChangeLog	17 May 2005 16:29:42 -0000	1.3193
+++ ChangeLog	18 May 2005 18:50:11 -0000	1.3194
@@ -1,3 +1,8 @@
+2005-05-18  Derek Price  <[email protected]>
+
+	* sanity.sh (config-9): Split to local/remote tests to avoid unportable
+	expr characters.
+
 2005-05-17  Derek Price  <[email protected]>
 
 	* sanity.sh: Use a predictable umask.

File [changed]: sanity.sh
Url: https://ccvs.cvshome.org/source/browse/ccvs/src/sanity.sh?r1=1.1062&r2=1.1063
Delta lines:  +9 -3
-------------------
--- sanity.sh	17 May 2005 16:29:43 -0000	1.1062
+++ sanity.sh	18 May 2005 18:50:11 -0000	1.1063
@@ -19866,9 +19866,15 @@
 -rw-rw-r--.*$TESTDIR/historylogs/2[0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]-[0-2][0-9]-[0-5][0-9]-[0-5][0-9]"
 
 	    # Should still see both commits.
+	    if $remote; then
+	      dotest config-9r "$testcvs history -ea" \
+"M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == <remote>
+M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == <remote>"
+	    else
 	    dotest config-9 "$testcvs history -ea" \
-"M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == \($TESTDIR/wnt/CVSROOT\|<remote>\)
-M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == \($TESTDIR/wnt/CVSROOT\|<remote>\)"
+"M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == $TESTDIR/wnt/CVSROOT
+M [0-9-]* [0-9:]* ${PLUS}0000 $username 1\.[0-9]* config CVSROOT == $TESTDIR/wnt/CVSROOT"
+	    fi
 
 	    # Remove this now to see what kind of error messages we get.
 	    rm -r $TESTDIR/historylogs