X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft9600-cvsimport.sh;h=0b115a17ab46e02ca7ec67f08feada0c48c8628a;hb=29313449f726f13ecc562cea9856645eade8e3e9;hp=29fee2dd13c6826338e92bf6e61cc39b057da444;hpb=65c6a4696a760f518c9f262705de030323c11146;p=git.git

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 29fee2dd1..0b115a17a 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -3,24 +3,40 @@
 test_description='git-cvsimport basic tests'
 . ./test-lib.sh
 
-if ! ( type cvs && type cvsps ) >/dev/null 2>&1
-then
-	test_expect_success 'skipping cvsimport tests, cvs/cvsps not found' ''
-	test_done
-	exit
-fi
-
 CVSROOT=$(pwd)/cvsroot
 export CVSROOT
 # for clean cvsps cache
 HOME=$(pwd)
 export HOME
 
+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)
+	;;
+'')
+	say 'skipping cvsimport tests, cvsps not found'
+	test_done
+	exit
+	;;
+*)
+	say 'skipping cvsimport tests, cvsps too old'
+	test_done
+	exit
+	;;
+esac
+
 test_expect_success 'setup cvsroot' 'cvs init'
 
 test_expect_success 'setup a cvs module' '
 
-	mkdir $CVSROOT/module &&
+	mkdir "$CVSROOT/module" &&
 	cvs co -d module-cvs module &&
 	cd module-cvs &&
 	cat <<EOF >o_fortuna &&
@@ -119,4 +135,16 @@ test_expect_success 'cvsimport.module config works' '
 
 '
 
+test_expect_success 'import from a CVS working tree' '
+
+	cvs co -d import-from-wt module &&
+	cd import-from-wt &&
+		git cvsimport -a -z0 &&
+		echo 1 >expect &&
+		git log -1 --pretty=format:%s%n >actual &&
+		git diff actual expect &&
+	cd ..
+
+'
+
 test_done