[PATCH v3 2/5] Use CVS's -f option if available (ignore user's ~/.cvsrc file)
From: Michael Haggerty <hidden>
Date: 2016-06-15 22:46:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- t/lib-cvs.sh | 3 +++ t/t9600-cvsimport.sh | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh
index bfc1c12..6738901 100644
--- a/t/lib-cvs.sh
+++ b/t/lib-cvs.sh@@ -14,6 +14,9 @@ then 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*)
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 98077ab..3110a8c 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 &&
--
1.6.1.3