# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 2007-12-27 18:23:22
# Node ID 206b44764340643de08603a50ce587c3efe25b1e
# Parent  4fba4fee0718021277307929c9536672e39d296a

test-convert-cvs: force cvs -f options to avoid cvsrc

There are some reference to a CVS_OPTIONS environment variable doing that but
it does not work on my system (cvs 1.11.20, macosx).

diff --git a/tests/test-convert-cvs b/tests/test-convert-cvs
--- a/tests/test-convert-cvs
+++ b/tests/test-convert-cvs
@@ -2,6 +2,11 @@
 
 "$TESTDIR/hghave" cvs cvsps || exit 80
 
+cvscall()
+{
+    cvs -f $@
+}
+
 echo "[extensions]" >> $HGRCPATH
 echo "convert = " >> $HGRCPATH
 
@@ -12,7 +17,7 @@ export CVSROOT=`pwd`
 export CVS_OPTIONS=-f
 cd ..
 
-cvs -q -d "$CVSROOT" init
+cvscall -q -d "$CVSROOT" init
 
 echo % create source directory
 mkdir src-temp
@@ -24,16 +29,16 @@ echo c > c
 cd ..
 
 echo % import source directory
-cvs -q import -m import src INITIAL start
+cvscall -q import -m import src INITIAL start
 cd ..
 
 echo % checkout source directory
-cvs -q checkout src
+cvscall -q checkout src
 
 echo % commit a new revision changing b/c
 cd src
 echo c >> b/c
-cvs -q commit -mci0 . | grep '<--' |\
+cvscall -q commit -mci0 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..
 
@@ -52,7 +57,7 @@ echo % commit new file revisions
 cd src
 echo a >> a
 echo c >> b/c
-cvs -q commit -mci1 . | grep '<--' |\
+cvscall -q commit -mci1 . | grep '<--' |\
     sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
 cd ..