From: Pavel Roskin <proski@gnu.org>
Date: Tue, 15 Jul 2008 00:20:19 +0000 (-0400)
Subject: t9600: allow testing with cvsps 2.2, including beta versions
X-Git-Tag: v1.6.0-rc0~60
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a271b2a9ceb2f65095cf789d2d7c7e44ca5d95f4;p=git.git

t9600: allow testing with cvsps 2.2, including beta versions

We've supported cvsps 2.1 so far.  Newer 2.2b1 (beta) seems to work with
us, too.

Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 655f88270..1e01e5c74 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -18,7 +18,7 @@ fi
 
 cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
 case "$cvsps_version" in
-2.1)
+2.1 | 2.2*)
 	;;
 '')
 	say 'skipping cvsimport tests, cvsps not found'
@@ -26,7 +26,7 @@ case "$cvsps_version" in
 	exit
 	;;
 *)
-	say 'skipping cvsimport tests, cvsps too old'
+	say 'skipping cvsimport tests, unsupported cvsps version'
 	test_done
 	exit
 	;;