mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hv/cvsps-tests'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2009-07-29 10:39:57 -07:00
parent 1c9b2d3aa1 0eaadfe625
commit b65954d172
28 changed files with 1627 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
t/t9600-cvsimport.sh
View File

@ -1,7 +1,7 @@
#!/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'
@ -10,37 +10,13 @@ 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 +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 +79,7 @@ translate to English
My Latin is terrible.
EOF
cvs commit -F message &&
$CVS commit -F message &&
cd ..
'
@ -121,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 +116,7 @@ test_expect_success 'cvsimport.module config works' '
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 +126,6 @@ test_expect_success 'import from a CVS working tree' '
'
test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
test_done