diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2009-02-23 06:08:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-23 21:56:45 -0800 |
| commit | 161261b12b3777bc78ef3fbe84ccf595dd195704 (patch) | |
| tree | 435527002350b690bba1ce9f47dea038dfca963c /t/t9600-cvsimport.sh | |
| parent | 535bb89320ba949f0d64eda530ba5dec0ec6f188 (diff) | |
| download | git-161261b12b3777bc78ef3fbe84ccf595dd195704.tar.gz git-161261b12b3777bc78ef3fbe84ccf595dd195704.tar.xz | |
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>
Diffstat (limited to 't/t9600-cvsimport.sh')
| -rwxr-xr-x | t/t9600-cvsimport.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh index 98077ab12..3110a8ce3 100755 --- 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 -test_expect_success 'setup cvsroot' 'cvs init' +test_expect_success 'setup cvsroot' '$CVS init' 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 @@ -30,13 +30,13 @@ egestatem, 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 - cvs commit -F message && + $CVS commit -F message && cd .. ' @@ -74,7 +74,7 @@ translate to English My Latin is terrible. EOF - cvs commit -F message && + $CVS commit -F message && cd .. ' @@ -92,8 +92,8 @@ test_expect_success 'update cvs module' ' cd module-cvs && echo 1 >tick && - cvs add tick && - cvs commit -m 1 + $CVS add tick && + $CVS commit -m 1 cd .. ' @@ -111,7 +111,7 @@ test_expect_success 'cvsimport.module config works' ' 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 && |