On Sun, Dec 02, 2007 at 11:41:10PM +0000, Johannes Schindelin wrote: > > Attached is the output of > > > > ./t9600-cvsimport.sh --verbose >/tmp/9600_out.txt 2>&1 > > > > Unfortunately you attached the interesting part, so I cannot quote it > here. Seems that your cvsps does not understand the "-A" option. So it > looks like it is too old. Yes, the changelog indicates that -A was added in 2.1, and he is running 2.0rc1. We can do something like this, though it feels a bit hack-ish and will need updated for new cvsps versions (a less lazy or more clever shell coder than me could do a nice >= version comparator). -- >8 -- t9600: require cvsps 2.1 to perform tests git-cvsimport won't run at all with less than cvsps 2.1, because it lacks the -A flag. But there's no point in preventing people who have an old cvsps from running the full testsuite. Signed-off-by: Jeff King <peff@xxxxxxxx> --- diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh index 08f0f2a..c646111 100755 --- a/t/t9600-cvsimport.sh +++ b/t/t9600-cvsimport.sh @@ -3,13 +3,29 @@ test_description='git-cvsimport basic tests' . ./test-lib.sh -if ! ( type cvs && type cvsps ) >/dev/null 2>&1 +if ! type cvs >/dev/null 2>&1 then - test_expect_success 'skipping cvsimport tests, cvs/cvsps not found' '' + test_expect_success 'skipping cvsimport tests, cvs not found' '' test_done exit fi +cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` +case "$cvsps_version" in +2.1) + ;; +'') + test_expect_success 'skipping cvsimport tests, cvsps not found' '' + test_done + exit + ;; +*) + test_expect_success 'skipping cvsimport tests, cvsps too old' '' + test_done + exit + ;; +esac + CVSROOT=$(pwd)/cvsroot export CVSROOT # for clean cvsps cache - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
