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>
This commit is contained in:

committed by
Junio C Hamano

parent
535bb89320
commit
161261b12b
@ -14,6 +14,9 @@ then
|
|||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
CVS="cvs -f"
|
||||||
|
export CVS
|
||||||
|
|
||||||
cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
|
cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
|
||||||
case "$cvsps_version" in
|
case "$cvsps_version" in
|
||||||
2.1 | 2.2*)
|
2.1 | 2.2*)
|
||||||
|
@ -6,12 +6,12 @@ test_description='git cvsimport basic tests'
|
|||||||
CVSROOT=$(pwd)/cvsroot
|
CVSROOT=$(pwd)/cvsroot
|
||||||
export CVSROOT
|
export CVSROOT
|
||||||
|
|
||||||
test_expect_success 'setup cvsroot' 'cvs init'
|
test_expect_success 'setup cvsroot' '$CVS init'
|
||||||
|
|
||||||
test_expect_success 'setup a cvs module' '
|
test_expect_success 'setup a cvs module' '
|
||||||
|
|
||||||
mkdir "$CVSROOT/module" &&
|
mkdir "$CVSROOT/module" &&
|
||||||
cvs co -d module-cvs module &&
|
$CVS co -d module-cvs module &&
|
||||||
cd module-cvs &&
|
cd module-cvs &&
|
||||||
cat <<EOF >o_fortuna &&
|
cat <<EOF >o_fortuna &&
|
||||||
O Fortuna
|
O Fortuna
|
||||||
@ -30,13 +30,13 @@ egestatem,
|
|||||||
potestatem
|
potestatem
|
||||||
dissolvit ut glaciem.
|
dissolvit ut glaciem.
|
||||||
EOF
|
EOF
|
||||||
cvs add o_fortuna &&
|
$CVS add o_fortuna &&
|
||||||
cat <<EOF >message &&
|
cat <<EOF >message &&
|
||||||
add "O Fortuna" lyrics
|
add "O Fortuna" lyrics
|
||||||
|
|
||||||
These public domain lyrics make an excellent sample text.
|
These public domain lyrics make an excellent sample text.
|
||||||
EOF
|
EOF
|
||||||
cvs commit -F message &&
|
$CVS commit -F message &&
|
||||||
cd ..
|
cd ..
|
||||||
'
|
'
|
||||||
|
|
||||||
@ -74,7 +74,7 @@ translate to English
|
|||||||
|
|
||||||
My Latin is terrible.
|
My Latin is terrible.
|
||||||
EOF
|
EOF
|
||||||
cvs commit -F message &&
|
$CVS commit -F message &&
|
||||||
cd ..
|
cd ..
|
||||||
'
|
'
|
||||||
|
|
||||||
@ -92,8 +92,8 @@ test_expect_success 'update cvs module' '
|
|||||||
|
|
||||||
cd module-cvs &&
|
cd module-cvs &&
|
||||||
echo 1 >tick &&
|
echo 1 >tick &&
|
||||||
cvs add tick &&
|
$CVS add tick &&
|
||||||
cvs commit -m 1
|
$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 &&
|
cd import-from-wt &&
|
||||||
git cvsimport -a -z0 &&
|
git cvsimport -a -z0 &&
|
||||||
echo 1 >expect &&
|
echo 1 >expect &&
|
||||||
|
Reference in New Issue
Block a user