tests: avoid export FOO=bar bashism

tests/test-convert-cvs

@@ -22,8 +22,10 echo "cvsps=cvsps -A -u --cvs-direct -q"
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init

tests/test-convert-cvs-branch

@@ -19,8 +19,10 echo "cvsps.cache=0" >> $HGRCPATH
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init

tests/test-convert-cvs-builtincvsps

@@ -21,8 +21,10 echo "cvsps=builtin" >> $HGRCPATH
 echo % create cvs repository
 mkdir cvsrepo
 cd cvsrepo
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init

tests/test-convert-cvs-builtincvsps-cvsnt-mergepoints

@@ -21,8 +21,10 echo "cvsps=builtin" >> $HGRCPATH
 echo % create cvs repository
 mkdir cvsmaster
 cd cvsmaster
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 cvscall -q -d "$CVSROOT" init

tests/test-convert-cvs-detectmerge

@@ -6,7 +6,8
 
 "$TESTDIR/hghave" cvs || exit 80
 
-export CVSROOT=`pwd`/cvsrepo
+CVSROOT=`pwd`/cvsrepo
+export CVSROOT
 
 # XXX copied from test-convert-cvs-synthetic
 cvscall()

tests/test-convert-cvs-synthetic

@@ -14,8 +14,10 echo "cvsps=builtin" >> $HGRCPATH
 echo % create cvs repository with one project
 mkdir cvsrepo
 cd cvsrepo
-export CVSROOT=`pwd`
-export CVS_OPTIONS=-f
+CVSROOT=`pwd`
+export CVSROOT
+CVS_OPTIONS=-f
+export CVS_OPTIONS
 cd ..
 
 filterpath()