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>
Jeff King committed
Dec 3, 2007 at 20:41 UTC
dcbcb707c366732c6b328ac6433d888f9915dcc5
1 file changed
+18
-2
t/t9600-cvsimport.sh
+18
-2
@@ -3,13 +3,29 @@
3
test_description='git-cvsimport basic tests'
4
. ./test-lib.sh
5
6
-if ! ( type cvs && type cvsps ) >/dev/null 2>&1
6
+if ! type cvs >/dev/null 2>&1
7
then
8
- test_expect_success 'skipping cvsimport tests, cvs/cvsps not found' ''
8
+ say 'skipping cvsimport tests, cvs not found'
9
test_done
10
exit
11
fi
12
13
+cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
14
+case "$cvsps_version" in
15
+2.1)
16
+ ;;
17
+'')
18
+ say 'skipping cvsimport tests, cvsps not found'
19
+ test_done
20
+ exit
21
+ ;;
22
+*)
23
+ say 'skipping cvsimport tests, cvsps too old'
24
+ test_done
25
+ exit
26
+ ;;
27
+esac
28
+
29
CVSROOT=$(pwd)/cvsroot
30
export CVSROOT
31
# for clean cvsps cache