[PATCH v2 3/5] Test contents of entire cvsimported "master" tree contents
Test added for completeness (it passes).
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
t/lib-cvs.sh | 41 +++++++++++++++++++++++++++++++++++++++++
t/t9600-cvsimport.sh | 2 ++
2 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh
index 6738901..47f0e55 100644
--- a/t/lib-cvs.sh
+++ b/t/lib-cvs.sh
@@ -32,3 +32,44 @@ case "$cvsps_version" in
exit
;;
esac
+
+test_cvs_export () {
+ # Usage: test_cvs_export 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
+ # Remove the CVS directories to make directory comparisons
+ # easier:
+ find module-cvs-"$1" -type d -name CVS -exec rm -rf '{}' ';' -prune
+}
+
+test_git_co_branch () {
+ # Usage: test_git_co BRANCH_NAME
+ (cd module-git && git checkout "$1")
+}
+
+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_export "$1" &&
+ test_git_co_branch "$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
+}
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 3110a8c..e3734b3 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -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
--
1.6.1.3
Michael Haggerty <mhagger@alum.mit.edu>