diff options
| author |  Jeff King <peff@peff.net> | 2007-12-03 20:41:45 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-12-04 14:43:05 -0800 |
| commit | dcbcb707c366732c6b328ac6433d888f9915dcc5 (patch) | |
| tree | ad5b8b836fe5c7430f433c930cdd9e8ebd00d3c1 | |
| parent | contrib: Make remotes2config.sh script more robust (diff) | |
| download | tgif-dcbcb707c366732c6b328ac6433d888f9915dcc5.tar.xz | |
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.
Tested-by: A Large Angry SCM <gitzilla@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | 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 08f0f2a3a3..7706430d81 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 |