Browse Source

Test contents of entire cvsimported "master" tree contents

Test added for completeness (it passes).

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 16 years ago committed by Junio C Hamano
parent
commit
cefa318ddb
  1. 44
      t/lib-cvs.sh
  2. 2
      t/t9600-cvsimport.sh

44
t/lib-cvs.sh

@ -32,3 +32,47 @@ case "$cvsps_version" in @@ -32,3 +32,47 @@ case "$cvsps_version" in
exit
;;
esac

test_cvs_co () {
# Usage: test_cvs_co BRANCH_NAME
rm -rf module-cvs-"$1"
if [ "$1" = "master" ]
then
$CVS co -P -d module-cvs-"$1" -A module
else
$CVS co -P -d module-cvs-"$1" -r "$1" module
fi
}

test_git_co () {
# Usage: test_git_co BRANCH_NAME
(cd module-git && git checkout "$1")
}

test_cmp_branch_file () {
# Usage: test_cmp_branch_file BRANCH_NAME PATH
# The branch must already be checked out of CVS and git.
test_cmp module-cvs-"$1"/"$2" module-git/"$2"
}

test_cmp_branch_tree () {
# Usage: test_cmp_branch_tree BRANCH_NAME
# Check BRANCH_NAME out of CVS and git and make sure that all
# of the files and directories are identical.

test_cvs_co "$1" &&
test_git_co "$1" &&
(
cd module-cvs-"$1"
find . -type d -name CVS -prune -o -type f -print
) | sort >module-cvs-"$1".list &&
(
cd module-git
find . -type d -name .git -prune -o -type f -print
) | sort >module-git-"$1".list &&
test_cmp module-cvs-"$1".list module-git-"$1".list &&
cat module-cvs-"$1".list | while read f
do
test_cmp_branch_file "$1" "$f" || return 1
done
}

2
t/t9600-cvsimport.sh

@ -121,4 +121,6 @@ test_expect_success 'import from a CVS working tree' ' @@ -121,4 +121,6 @@ test_expect_success 'import from a CVS working tree' '

'

test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'

test_done

Loading…
Cancel
Save