Use CVS's -f option if available (ignore user's ~/.cvsrc file)

A user's ~/.cvsrc file can change the basic behavior of CVS commands.
Therefore we should ignore it in order to ensure consistent results
from the test suite.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh
index bfc1c12f3f3d46626c80a411fe50cb9ac100b7f7..67389012eb3f4604f2979bcb1f4e2144fdfd33bf 100644 (file)
--- a/t/lib-cvs.sh
+++ b/t/lib-cvs.sh
@@ -14,6 +14,9 @@ then
        exit
 fi
 
        exit
 fi
 

+CVS="cvs -f"
+export CVS
+

 cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
 case "$cvsps_version" in
 2.1 | 2.2*)
 cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
 case "$cvsps_version" in
 2.1 | 2.2*)

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 98077ab12b7b665ea068b5ef27fc20edadd5ebc4..3110a8ce362ba0362d7cce3d549e4257ad6fa3ff 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -6,12 +6,12 @@ test_description='git cvsimport basic tests'
 CVSROOT=$(pwd)/cvsroot
 export CVSROOT
 
 CVSROOT=$(pwd)/cvsroot
 export CVSROOT
 

-test_expect_success 'setup cvsroot' 'cvs init'
+test_expect_success 'setup cvsroot' '$CVS init'

 
 test_expect_success 'setup a cvs module' '
 
        mkdir "$CVSROOT/module" &&
 
 test_expect_success 'setup a cvs module' '
 
        mkdir "$CVSROOT/module" &&

-       cvs co -d module-cvs module &&
+       $CVS co -d module-cvs module &&

        cd module-cvs &&
        cat <<EOF >o_fortuna &&
 O Fortuna
        cd module-cvs &&
        cat <<EOF >o_fortuna &&
 O Fortuna


@@ -30,13 +30,13 @@ egestatem,
 potestatem
 dissolvit ut glaciem.
 EOF
 potestatem
 dissolvit ut glaciem.
 EOF

-       cvs add o_fortuna &&
+       $CVS add o_fortuna &&

        cat <<EOF >message &&
 add "O Fortuna" lyrics
 
 These public domain lyrics make an excellent sample text.
 EOF
        cat <<EOF >message &&
 add "O Fortuna" lyrics
 
 These public domain lyrics make an excellent sample text.
 EOF

-       cvs commit -F message &&
+       $CVS commit -F message &&

        cd ..
 '
 
        cd ..
 '
 


@@ -74,7 +74,7 @@ translate to English
 
 My Latin is terrible.
 EOF
 
 My Latin is terrible.
 EOF

-       cvs commit -F message &&
+       $CVS commit -F message &&

        cd ..
 '
 
        cd ..
 '
 


@@ -92,8 +92,8 @@ test_expect_success 'update cvs module' '
 
        cd module-cvs &&
                echo 1 >tick &&
 
        cd module-cvs &&
                echo 1 >tick &&

-               cvs add tick &&
-               cvs commit -m 1
+               $CVS add tick &&
+               $CVS commit -m 1

        cd ..
 
 '
        cd ..
 
 '


@@ -111,7 +111,7 @@ test_expect_success 'cvsimport.module config works' '
 
 test_expect_success 'import from a CVS working tree' '
 
 
 test_expect_success 'import from a CVS working tree' '
 

-       cvs co -d import-from-wt module &&
+       $CVS co -d import-from-wt module &&

        cd import-from-wt &&
                git cvsimport -a -z0 &&
                echo 1 >expect &&
        cd import-from-wt &&
                git cvsimport -a -z0 &&
                echo 1 >expect &&