From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Haggerty Subject: [PATCH v2 2/5] Use CVS's -f option if available (ignore user's ~/.cvsrc file) Date: Sat, 21 Feb 2009 14:04:37 +0100 Message-ID: <7d834a5a7542df6bfa8963bb6440cc4b4531ead7.1235220105.git.mhagger@alum.mit.edu> References: <1235221480-31473-1-git-send-email-mhagger@alum.mit.edu> Cc: gitster@pobox.com, peff@peff.net, Johannes.Schindelin@gmx.de, jnareb@gmail.com, Michael Haggerty To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Feb 21 14:07:15 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LarZa-0004DE-QD for gcvg-git-2@gmane.org; Sat, 21 Feb 2009 14:07:15 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752410AbZBUNFV (ORCPT ); Sat, 21 Feb 2009 08:05:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752444AbZBUNFT (ORCPT ); Sat, 21 Feb 2009 08:05:19 -0500 Received: from einhorn.in-berlin.de ([192.109.42.8]:57480 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752410AbZBUNFO (ORCPT ); Sat, 21 Feb 2009 08:05:14 -0500 X-Envelope-From: mhagger@alum.mit.edu Received: from localhost.localdomain (77-21-84-251-dynip.superkabel.de [77.21.84.251]) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id n1LD4fLE022313; Sat, 21 Feb 2009 14:04:42 +0100 X-Mailer: git-send-email 1.6.1.3 In-Reply-To: In-Reply-To: References: X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- 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 <o_fortuna && O Fortuna @@ -30,13 +30,13 @@ egestatem, potestatem dissolvit ut glaciem. EOF - cvs add o_fortuna && + $CVS add o_fortuna && cat <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