diff options
Diffstat (limited to 't/t9600-cvsimport.sh')
| -rwxr-xr-x | t/t9600-cvsimport.sh | 142 |
1 files changed, 75 insertions, 67 deletions
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh index 0d7786a8c7..4c384ff023 100755 --- a/t/t9600-cvsimport.sh +++ b/t/t9600-cvsimport.sh @@ -1,45 +1,20 @@ #!/bin/sh -test_description='git-cvsimport basic tests' -. ./test-lib.sh - -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 - exit -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 - exit - ;; -*) - say 'skipping cvsimport tests, unsupported cvsps version' - test_done - exit - ;; -esac - -test_expect_success 'setup cvsroot' 'cvs init' - -test_expect_success 'setup a cvs module' ' +test_description='git cvsimport basic tests' +. ./lib-cvs.sh + +test_expect_success PERL 'setup cvsroot environment' ' + CVSROOT=$(pwd)/cvsroot && + export CVSROOT +' + +test_expect_success PERL 'setup cvsroot' '$CVS init' + +test_expect_success PERL 'setup a cvs module' ' mkdir "$CVSROOT/module" && - cvs co -d module-cvs module && - cd module-cvs && + $CVS co -d module-cvs module && + (cd module-cvs && cat <<EOF >o_fortuna && O Fortuna velut luna @@ -57,28 +32,34 @@ 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 && - cd .. + $CVS commit -F message + ) ' -test_expect_success 'import a trivial module' ' +test_expect_success PERL 'import a trivial module' ' - git cvsimport -a -z 0 -C module-git module && + git cvsimport -a -R -z 0 -C module-git module && test_cmp module-cvs/o_fortuna module-git/o_fortuna ' -test_expect_success 'pack refs' 'cd module-git && git gc && cd ..' +test_expect_success PERL 'pack refs' '(cd module-git && git gc)' -test_expect_success 'update cvs module' ' +test_expect_success PERL 'initial import has correct .git/cvs-revisions' ' - cd module-cvs && + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1) > expected && + test_cmp expected module-git/.git/cvs-revisions +' + +test_expect_success PERL 'update cvs module' ' + (cd module-cvs && cat <<EOF >o_fortuna && O Fortune, like the moon @@ -101,51 +82,78 @@ translate to English My Latin is terrible. EOF - cvs commit -F message && - cd .. + $CVS commit -F message + ) ' -test_expect_success 'update git module' ' +test_expect_success PERL 'update git module' ' - cd module-git && + (cd module-git && + git config cvsimport.trackRevisions true && git cvsimport -a -z 0 module && - git merge origin && - cd .. && + git merge origin + ) && test_cmp module-cvs/o_fortuna module-git/o_fortuna ' -test_expect_success 'update cvs module' ' +test_expect_success PERL 'update has correct .git/cvs-revisions' ' - cd module-cvs && - echo 1 >tick && - cvs add tick && - cvs commit -m 1 - cd .. + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1 HEAD^ && + git log --format="o_fortuna 1.2 %H" -1 HEAD) > expected && + test_cmp expected module-git/.git/cvs-revisions +' + +test_expect_success PERL 'update cvs module' ' + (cd module-cvs && + echo 1 >tick && + $CVS add tick && + $CVS commit -m 1 + ) ' -test_expect_success 'cvsimport.module config works' ' +test_expect_success PERL 'cvsimport.module config works' ' - cd module-git && + (cd module-git && git config cvsimport.module module && + git config cvsimport.trackRevisions true && git cvsimport -a -z0 && - git merge origin && - cd .. && + git merge origin + ) && test_cmp module-cvs/tick module-git/tick ' -test_expect_success 'import from a CVS working tree' ' +test_expect_success PERL 'second update has correct .git/cvs-revisions' ' + + (cd module-git && + git log --format="o_fortuna 1.1 %H" -1 HEAD^^ && + git log --format="o_fortuna 1.2 %H" -1 HEAD^ + git log --format="tick 1.1 %H" -1 HEAD) > expected && + test_cmp expected module-git/.git/cvs-revisions +' - cvs co -d import-from-wt module && - cd import-from-wt && +test_expect_success PERL 'import from a CVS working tree' ' + + $CVS co -d import-from-wt module && + (cd import-from-wt && + git config cvsimport.trackRevisions false && git cvsimport -a -z0 && echo 1 >expect && git log -1 --pretty=format:%s%n >actual && - test_cmp actual expect && - cd .. + test_cmp actual expect + ) ' +test_expect_success PERL 'no .git/cvs-revisions created by default' ' + + ! test -e import-from-wt/.git/cvs-revisions + +' + +test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master' + test_done |