diff options
Diffstat (limited to 't/t9600-cvsimport.sh')
| -rwxr-xr-x | t/t9600-cvsimport.sh | 57 |
1 files changed, 19 insertions, 38 deletions
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh index 7706430d81..363345faef 100755 --- a/t/t9600-cvsimport.sh +++ b/t/t9600-cvsimport.sh @@ -1,43 +1,22 @@ #!/bin/sh -test_description='git-cvsimport basic tests' -. ./test-lib.sh +test_description='git cvsimport basic tests' +. ./lib-cvs.sh -if ! type cvs >/dev/null 2>&1 -then - say 'skipping cvsimport tests, cvs not found' +if ! test_have_prereq PERL; then + say 'skipping git cvsimport tests, perl not available' 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 - CVSROOT=$(pwd)/cvsroot export CVSROOT -# for clean cvsps cache -HOME=$(pwd) -export HOME -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 && + mkdir "$CVSROOT/module" && + $CVS co -d module-cvs module && cd module-cvs && cat <<EOF >o_fortuna && O Fortuna @@ -56,20 +35,20 @@ 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 .. ' test_expect_success 'import a trivial module' ' git cvsimport -a -z 0 -C module-git module && - git diff module-cvs/o_fortuna module-git/o_fortuna + test_cmp module-cvs/o_fortuna module-git/o_fortuna ' @@ -100,7 +79,7 @@ translate to English My Latin is terrible. EOF - cvs commit -F message && + $CVS commit -F message && cd .. ' @@ -110,7 +89,7 @@ test_expect_success 'update git module' ' git cvsimport -a -z 0 module && git merge origin && cd .. && - git diff module-cvs/o_fortuna module-git/o_fortuna + test_cmp module-cvs/o_fortuna module-git/o_fortuna ' @@ -118,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 .. ' @@ -131,20 +110,22 @@ test_expect_success 'cvsimport.module config works' ' git cvsimport -a -z0 && git merge origin && cd .. && - git diff module-cvs/tick module-git/tick + test_cmp module-cvs/tick module-git/tick ' 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 && git log -1 --pretty=format:%s%n >actual && - git diff actual expect && + test_cmp actual expect && cd .. ' +test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master' + test_done |