Merge branch 'hv/cvsps-tests'

* hv/cvsps-tests:
t/t9600: remove exit after test_done
cvsimport: extend testcase about patchset order to contain branches
cvsimport: add test illustrating a bug in cvsps
Add a test of "git cvsimport"'s handling of tags and branches
Add some tests of git-cvsimport's handling of vendor branches
Test contents of entire cvsimported "master" tree contents
Use CVS's -f option if available (ignore user's ~/.cvsrc file)
Start a library for cvsimport-related tests

diff --combined t/t9600-cvsimport.sh
index 4322a0c1ed6d792cbba4b52a7ba8bad74986bbad,e3734b3ba935f6d0b6b5a6fa83c341dee2f029d2..363345faef7b1eb209c548914b94460d9475cb13
--- 1/t/t9600-cvsimport.sh
--- 2/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@@ -1,46 -1,17 +1,22 @@@
  #!/bin/sh
  
  test_description='git cvsimport basic tests'
- . ./test-lib.sh
+ . ./lib-cvs.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
- 
- if ! type cvs >/dev/null 2>&1
- then
-       say 'skipping cvsimport tests, cvs not found'
-       test_done
- fi
- 
- cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'`
- case "$cvsps_version" in
- 2.1 | 2.2*)
-       ;;
- '')
-       say 'skipping cvsimport tests, cvsps not found'
-       test_done
-       ;;
- *)
-       say 'skipping cvsimport tests, unsupported cvsps version'
-       test_done
-       ;;
- esac
  
- test_expect_success 'setup cvsroot' 'cvs init'
+ test_expect_success 'setup cvsroot' '$CVS init'
  
  test_expect_success 'setup a cvs module' '
  
        mkdir "$CVSROOT/module" &&
-       cvs co -d module-cvs module &&
+       $CVS co -d module-cvs module &&
        cd module-cvs &&
        cat <<EOF >o_fortuna &&
  O Fortuna
@@@ -59,13 -30,13 +35,13 @@@ egestatem
  potestatem
  dissolvit ut glaciem.
  EOF
-       cvs add o_fortuna &&
+       $CVS add o_fortuna &&
        cat <<EOF >message &&
  add "O Fortuna" lyrics
  
  These public domain lyrics make an excellent sample text.
  EOF
-       cvs commit -F message &&
+       $CVS commit -F message &&
        cd ..
  '
  
@@@ -103,7 -74,7 +79,7 @@@ translate to Englis
  
  My Latin is terrible.
  EOF
-       cvs commit -F message &&
+       $CVS commit -F message &&
        cd ..
  '
  
@@@ -121,8 -92,8 +97,8 @@@ test_expect_success 'update cvs module
  
        cd module-cvs &&
                echo 1 >tick &&
-               cvs add tick &&
-               cvs commit -m 1
+               $CVS add tick &&
+               $CVS commit -m 1
        cd ..
  
  '
@@@ -140,7 -111,7 +116,7 @@@ test_expect_success 'cvsimport.module c
  
  test_expect_success 'import from a CVS working tree' '
  
-       cvs co -d import-from-wt module &&
+       $CVS co -d import-from-wt module &&
        cd import-from-wt &&
                git cvsimport -a -z0 &&
                echo 1 >expect &&
@@@ -150,4 -121,6 +126,6 @@@
  
  '
  
+ test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
  test_done