From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Jul 2009 17:39:57 +0000 (-0700)
Subject: Merge branch 'hv/cvsps-tests'
X-Git-Tag: v1.6.5-rc0~127
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b65954d1720960f888d1d51e51befb84e05018eb;p=git.git

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
---

b65954d1720960f888d1d51e51befb84e05018eb
diff --cc t/t9600-cvsimport.sh
index 4322a0c1e,e3734b3ba..363345fae
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@@ -1,41 -1,12 +1,17 @@@
  #!/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' '