X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9600-cvsimport.sh;h=4322a0c1ed6d792cbba4b52a7ba8bad74986bbad;hb=75b44066f3ed7cde238cdea1f0bf9e2f1744c820;hp=655f88270b27b637b6d4b7d3fdb3af76f525064f;hpb=afce435000030e3ad076ef1dd413e0fa314cdcbb;p=git.git

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 655f88270..4322a0c1e 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
-test_description='git-cvsimport basic tests'
+test_description='git cvsimport basic tests'
 . ./test-lib.sh
 
+if ! test_have_prereq PERL; then
+	say 'skipping git cvsimport tests, perl not available'
+	test_done
+fi
+
 CVSROOT=$(pwd)/cvsroot
 export CVSROOT
+unset CVS_SERVER
 # for clean cvsps cache
 HOME=$(pwd)
 export HOME
@@ -13,22 +19,19 @@ if ! type cvs >/dev/null 2>&1
 then
 	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)
+2.1 | 2.2*)
 	;;
 '')
 	say 'skipping cvsimport tests, cvsps not found'
 	test_done
-	exit
 	;;
 *)
-	say 'skipping cvsimport tests, cvsps too old'
+	say 'skipping cvsimport tests, unsupported cvsps version'
 	test_done
-	exit
 	;;
 esac