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. Tested-by: A Large Angry SCM <gitzilla@xxxxxxxxx> Signed-off-by: Jeff King <peff@xxxxxxxx> --- On Mon, Dec 03, 2007 at 03:21:55PM -0800, Junio C Hamano wrote: > Jeff, would you want to further amend the patch to use "say" as Hannes > suggested to make it look nicer? Here it is. t/t9600-cvsimport.sh | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh index 08f0f2a..7706430 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' '' + say '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) + ;; +'') + say 'skipping cvsimport tests, cvsps not found' + test_done + exit + ;; +*) + say 'skipping cvsimport tests, cvsps too old' + test_done + exit + ;; +esac + CVSROOT=$(pwd)/cvsroot export CVSROOT # for clean cvsps cache -- 1.5.3.7.2070.g88cf2-dirty - 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
